summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Valcárcel <nvalcarcel@ubuntu.com>2014-02-09 16:09:59 +0000
committerColin Watson <cjwatson@debian.org>2015-08-19 16:33:32 +0100
commit4f55e60d2296feba17b473b2146a75debe29993a (patch)
tree96c26319208405b4f5d8e8012ccf053f969cdfbd
parent39b2121148a0aa016a648446823c8f02c5fd95b3 (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 887b014b8..afa4a2fb0 100644
--- a/scp.c
+++ b/scp.c
@@ -190,8 +190,16 @@ do_local_cmd(arglist *a)
190 190
191 if (verbose_mode) { 191 if (verbose_mode) {
192 fprintf(stderr, "Executing:"); 192 fprintf(stderr, "Executing:");
193 for (i = 0; i < a->num; i++) 193 for (i = 0; i < a->num; i++) {
194 fprintf(stderr, " %s", a->list[i]); 194 if (i == 0)
195 fprintf(stderr, " %s", a->list[i]);
196 else
197 /*
198 * TODO: misbehaves if a->list[i] contains a
199 * single quote
200 */
201 fprintf(stderr, " '%s'", a->list[i]);
202 }
195 fprintf(stderr, "\n"); 203 fprintf(stderr, "\n");
196 } 204 }
197 if ((pid = fork()) == -1) 205 if ((pid = fork()) == -1)