summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Valcárcel <nvalcarcel@ubuntu.com>2014-02-09 16:09:59 +0000
committerColin Watson <cjwatson@debian.org>2014-02-09 23:43:41 +0000
commitbb3ea9f222f7f0fe9b449b75bfae93513f7ca3e2 (patch)
tree185d6c52c7ce56e8519c1e1e97453eb5ed14b24a
parent2bb37315c1e077bc176e703fbf0028a1f6315d37 (diff)
Adjust scp quoting in verbose mode
Tweak scp's reporting of filenames in verbose mode to be a bit less confusing with spaces. This should be revised to mimic real shell quoting. Bug-Ubuntu: https://bugs.launchpad.net/bugs/89945 Last-Update: 2010-02-27 Patch-Name: scp-quoting.patch
-rw-r--r--scp.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/scp.c b/scp.c
index 28ded5e9a..b7a17abfe 100644
--- a/scp.c
+++ b/scp.c
@@ -189,8 +189,16 @@ do_local_cmd(arglist *a)
189 189
190 if (verbose_mode) { 190 if (verbose_mode) {
191 fprintf(stderr, "Executing:"); 191 fprintf(stderr, "Executing:");
192 for (i = 0; i < a->num; i++) 192 for (i = 0; i < a->num; i++) {
193 fprintf(stderr, " %s", a->list[i]); 193 if (i == 0)
194 fprintf(stderr, " %s", a->list[i]);
195 else
196 /*
197 * TODO: misbehaves if a->list[i] contains a
198 * single quote
199 */
200 fprintf(stderr, " '%s'", a->list[i]);
201 }
194 fprintf(stderr, "\n"); 202 fprintf(stderr, "\n");
195 } 203 }
196 if ((pid = fork()) == -1) 204 if ((pid = fork()) == -1)