2 files changed, 12 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 139e9604a..b08532cc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ openssh (1:4.7p1-8) UNRELEASED; urgency=low
   * Fill in CVE identifier for security vulnerability fixed in 1:4.7p1-5.
   * Rename KeepAlive to TCPKeepAlive in sshd_config, cleaning up from old
     configurations (LP: #211400).
+  * Tweak scp's reporting of filenames in verbose mode to be a bit less
+    confusing with spaces (thanks, Nicolas Valcárcel; LP: #89945).
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 01 Apr 2008 14:12:43 +0100
 
diff --git a/scp.c b/scp.c
index 1765a44e6..5d9e4bc29 100644
--- a/scp.c
+++ b/scp.c
@@ -159,8 +159,16 @@ do_local_cmd(arglist *a)
 
         if (verbose_mode) {
                 fprintf(stderr, "Executing:");
-                for (i = 0; i < a->num; i++)
-                        fprintf(stderr, " %s", a->list[i]);
+                for (i = 0; i < a->num; i++) {
+                        if (i == 0)
+                                fprintf(stderr, " %s", a->list[i]);
+                        else
+                                /*
+                                 * TODO: misbehaves if a->list[i] contains a
+                                 * single quote
+                                 */
+                                fprintf(stderr, " '%s'", a->list[i]);
+                }
                 fprintf(stderr, "\n");
         }
         if ((pid = fork()) == -1)