Author: gnodet
Date: Thu May 6 13:46:02 2010
New Revision: 941725
URL: http://svn.apache.org/viewvc?rev=941725&view=rev
Log:
[sshd] fix sftp navigation
Modified:
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/util/SelectorUtils.java
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/sftp/SftpSubsystem.java
Modified:
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/util/SelectorUtils.java
URL:
http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/util/SelectorUtils.java?rev=941725&r1=941724&r2=941725&view=diff
==============================================================================
---
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/util/SelectorUtils.java
(original)
+++
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/util/SelectorUtils.java
Thu May 6 13:46:02 2010
@@ -548,7 +548,7 @@ public final class SelectorUtils {
tokens.remove(i);
} else if (t.equals("..")) {
tokens.remove(i);
- if (i > 1) {
+ if (i >= 1) {
tokens.remove(--i);
}
}
Modified:
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/sftp/SftpSubsystem.java
URL:
http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/sftp/SftpSubsystem.java?rev=941725&r1=941724&r2=941725&view=diff
==============================================================================
---
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/sftp/SftpSubsystem.java
(original)
+++
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/sftp/SftpSubsystem.java
Thu May 6 13:46:02 2010
@@ -789,7 +789,7 @@ public class SftpSubsystem implements Co
buffer.putString(normalizedPath);
f = new File(normalizedPath);
if (f.getName().length() == 0) {
- f = new File(f, ".");
+ f = resolveFile(".");
}
if (version <= 3) {
buffer.putString(getLongName(f)); // Format specified in the specs
