1 files changed, 10 insertions, 2 deletions

diff --git a/scp.c b/scp.c
index 0348d0673..5a7a92a7e 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)