Changeset 2027

Timestamp:

02/14/2010 12:01:44 PM (5 months ago)

Author:

djb61

Message:

Make the change to getInodeByPath() introduced in [2021] less broad, specifically only resolve out symlinks where the link is not the last component of the path. This retains the behaviour to make CWD work to subdirectories of symlinks but should prevent breakage in other parts of the system.

Whilst I'm here remove an unrelated redundant import.
See: #269

Location:

trunk/src

Files:

• master/src/org/drftpd/vfs/VirtualFileSystem.java (modified) (1 diff)
• plugins/org.drftpd.commands.nuke/src/org/drftpd/commands/nuke/Nuke.java (modified) (1 diff)

trunk/src/master/src/org/drftpd/vfs/VirtualFileSystem.java

@@ -190 +190 @@
                         if (inode.isDirectory()) {
                                 walker = (VirtualFileSystemDirectory) inode;
-                        } else if (inode.isLink()) {
+                        } else if (inode.isLink() && (x != values.length - 1)) {
                                 walker = (VirtualFileSystemDirectory) getInodeByPath(((VirtualFileSystemLink)inode).getLinkPath());
                         } else { // We better be at the end of the array

trunk/src/plugins/org.drftpd.commands.nuke/src/org/drftpd/commands/nuke/Nuke.java

@@ -31 +31 @@
 import org.drftpd.master.BaseFtpConnection;
 import org.drftpd.sections.SectionInterface;
-import org.drftpd.util.ReplacerUtils;
 import org.drftpd.commandmanager.CommandInterface;
 import org.drftpd.commandmanager.CommandRequest;