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

1 files changed, 10 insertions, 2 deletions

diff --git a/scp.c b/scp.c
index 80bc0e8b1..a2dc410bd 100644
--- a/scp.c
+++ b/scp.c
@@ -199,8 +199,16 @@ do_local_cmd(arglist *a)
 
         if (verbose_mode) {
                 fprintf(stderr, "Executing:");
-                for (i = 0; i < a->num; i++)
-                        fmprintf(stderr, " %s", a->list[i]);
+                for (i = 0; i < a->num; i++) {
+                        if (i == 0)
+                                fmprintf(stderr, " %s", a->list[i]);
+                        else
+                                /*
+                                 * TODO: misbehaves if a->list[i] contains a
+                                 * single quote
+                                 */
+                                fmprintf(stderr, " '%s'", a->list[i]);
+                }
                 fprintf(stderr, "\n");
         }
         if ((pid = fork()) == -1)