1 files changed, 14 insertions, 7 deletions

diff --git a/scp.c b/scp.c
index 3b7ca5a8d..0b483df99 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.164 2008/10/10 04:55:16 stevesk Exp $ */
+/* $OpenBSD: scp.c,v 1.165 2009/12/20 07:28:36 guenther Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -252,8 +252,11 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout)
                 close(pout[1]);
 
                 replacearg(&args, 0, "%s", ssh_program);
-                if (remuser != NULL)
-                        addargs(&args, "-l%s", remuser);
+                if (remuser != NULL) {
+                        addargs(&args, "-l");
+                        addargs(&args, "%s", remuser);
+                }
+                addargs(&args, "--");
                 addargs(&args, "%s", host);
                 addargs(&args, "%s", cmd);
 
@@ -345,10 +348,12 @@ main(int argc, char **argv)
                 case 'c':
                 case 'i':
                 case 'F':
-                        addargs(&args, "-%c%s", ch, optarg);
+                        addargs(&args, "-%c", ch);
+                        addargs(&args, "%s", optarg);
                         break;
                 case 'P':
-                        addargs(&args, "-p%s", optarg);
+                        addargs(&args, "-p");
+                        addargs(&args, "%s", optarg);
                         break;
                 case 'B':
                         addargs(&args, "-oBatchmode yes");
@@ -556,6 +561,7 @@ toremote(char *targ, int argc, char **argv)
                         } else {
                                 host = cleanhostname(argv[i]);
                         }
+                        addargs(&alist, "--");
                         addargs(&alist, "%s", host);
                         addargs(&alist, "%s", cmd);
                         addargs(&alist, "%s", src);
@@ -566,7 +572,7 @@ toremote(char *targ, int argc, char **argv)
                                 errs = 1;
                 } else {        /* local to remote */
                         if (remin == -1) {
-                                xasprintf(&bp, "%s -t %s", cmd, targ);
+                                xasprintf(&bp, "%s -t -- %s", cmd, targ);
                                 host = cleanhostname(thost);
                                 if (do_cmd(host, tuser, bp, &remin,
                                     &remout) < 0)
@@ -599,6 +605,7 @@ tolocal(int argc, char **argv)
                                 addargs(&alist, "-r");
                         if (pflag)
                                 addargs(&alist, "-p");
+                        addargs(&alist, "--");
                         addargs(&alist, "%s", argv[i]);
                         addargs(&alist, "%s", argv[argc-1]);
                         if (do_local_cmd(&alist))
@@ -618,7 +625,7 @@ tolocal(int argc, char **argv)
                                 suser = pwd->pw_name;
                 }
                 host = cleanhostname(host);
-                xasprintf(&bp, "%s -f %s", cmd, src);
+                xasprintf(&bp, "%s -f -- %s", cmd, src);
                 if (do_cmd(host, suser, bp, &remin, &remout) < 0) {
                         (void) xfree(bp);
                         ++errs;