You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2009/08/17 08:59:49 UTC
svn commit: r804877 - in /mina/sshd/trunk/sshd-core/src:
main/java/org/apache/sshd/server/command/ScpCommand.java
test/java/org/apache/sshd/ScpTest.java
Author: gnodet
Date: Mon Aug 17 06:59:49 2009
New Revision: 804877
URL: http://svn.apache.org/viewvc?rev=804877&view=rev
Log:
SSHD-39: ScpCommand cannot handle recursive copy
Modified:
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/command/ScpCommand.java
mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/ScpTest.java
Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/command/ScpCommand.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/command/ScpCommand.java?rev=804877&r1=804876&r2=804877&view=diff
==============================================================================
--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/command/ScpCommand.java (original)
+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/command/ScpCommand.java Mon Aug 17 06:59:49 2009
@@ -86,9 +86,9 @@
} else if (i == args.length - 1) {
root = new File(args[args.length - 1]);
}
- if (!optF && !optT) {
- error = new IOException("Either -f or -t option should be set");
- }
+ }
+ if (!optF && !optT) {
+ error = new IOException("Either -f or -t option should be set");
}
}
Modified: mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/ScpTest.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/ScpTest.java?rev=804877&r1=804876&r2=804877&view=diff
==============================================================================
--- mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/ScpTest.java (original)
+++ mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/ScpTest.java Mon Aug 17 06:59:49 2009
@@ -169,7 +169,7 @@
protected String readDir(String path) throws Exception {
ChannelExec c = (ChannelExec) session.openChannel("exec");
- c.setCommand("scp -f -r " + path);
+ c.setCommand("scp -r -f " + path);
c.connect();
OutputStream os = c.getOutputStream();
InputStream is = c.getInputStream();