summaryrefslogtreecommitdiff
path: root/scp.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-01-31 22:11:37 +1100
committerDamien Miller <djm@mindrot.org>2006-01-31 22:11:37 +1100
commit923f1ce0b779e59bb7c0cf46351b8a262964e7f3 (patch)
tree0733670f493c271186049a2d86b044d4ee855db0 /scp.c
parent50c6eedce395ad0b828067c5e65ce9eb9e1543af (diff)
- djm@cvs.openbsd.org 2006/01/31 10:35:43
[scp.c] "scp a b c" shouldn't clobber "c" when it is not a directory, report and fix from biorn@; ok markus@
Diffstat (limited to 'scp.c')
-rw-r--r--scp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/scp.c b/scp.c
index 2467dcb5c..620024ea7 100644
--- a/scp.c
+++ b/scp.c
@@ -71,7 +71,7 @@
71 */ 71 */
72 72
73#include "includes.h" 73#include "includes.h"
74RCSID("$OpenBSD: scp.c,v 1.129 2006/01/31 10:19:02 djm Exp $"); 74RCSID("$OpenBSD: scp.c,v 1.130 2006/01/31 10:35:43 djm Exp $");
75 75
76#include "xmalloc.h" 76#include "xmalloc.h"
77#include "atomicio.h" 77#include "atomicio.h"
@@ -383,9 +383,9 @@ main(int argc, char **argv)
383 if ((targ = colon(argv[argc - 1]))) /* Dest is remote host. */ 383 if ((targ = colon(argv[argc - 1]))) /* Dest is remote host. */
384 toremote(targ, argc, argv); 384 toremote(targ, argc, argv);
385 else { 385 else {
386 tolocal(argc, argv); /* Dest is local host. */
387 if (targetshouldbedirectory) 386 if (targetshouldbedirectory)
388 verifydir(argv[argc - 1]); 387 verifydir(argv[argc - 1]);
388 tolocal(argc, argv); /* Dest is local host. */
389 } 389 }
390 /* 390 /*
391 * Finally check the exit status of the ssh process, if one was forked 391 * Finally check the exit status of the ssh process, if one was forked