summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2008-04-04 12:44:42 +0000
committerColin Watson <cjwatson@debian.org>2008-04-04 12:44:42 +0000
commitbfb5ee9d4b1a9dae5bc984975a9cf6c07a86492f (patch)
tree587b69626a0566f0e9b0e3dfbd6b59030cb792a2
parenta3c72564e73096901a77c6d61020b494b3a44e6d (diff)
Tweak scp's reporting of filenames in verbose mode to be a bit less
confusing with spaces (thanks, Nicolas Valcárcel; LP: #89945).
-rw-r--r--debian/changelog2
-rw-r--r--scp.c12
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
3 * Fill in CVE identifier for security vulnerability fixed in 1:4.7p1-5. 3 * Fill in CVE identifier for security vulnerability fixed in 1:4.7p1-5.
4 * Rename KeepAlive to TCPKeepAlive in sshd_config, cleaning up from old 4 * Rename KeepAlive to TCPKeepAlive in sshd_config, cleaning up from old
5 configurations (LP: #211400). 5 configurations (LP: #211400).
6 * Tweak scp's reporting of filenames in verbose mode to be a bit less
7 confusing with spaces (thanks, Nicolas Valcárcel; LP: #89945).
6 8
7 -- Colin Watson <cjwatson@debian.org> Tue, 01 Apr 2008 14:12:43 +0100 9 -- Colin Watson <cjwatson@debian.org> Tue, 01 Apr 2008 14:12:43 +0100
8 10
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)
159 159
160 if (verbose_mode) { 160 if (verbose_mode) {
161 fprintf(stderr, "Executing:"); 161 fprintf(stderr, "Executing:");
162 for (i = 0; i < a->num; i++) 162 for (i = 0; i < a->num; i++) {
163 fprintf(stderr, " %s", a->list[i]); 163 if (i == 0)
164 fprintf(stderr, " %s", a->list[i]);
165 else
166 /*
167 * TODO: misbehaves if a->list[i] contains a
168 * single quote
169 */
170 fprintf(stderr, " '%s'", a->list[i]);
171 }
164 fprintf(stderr, "\n"); 172 fprintf(stderr, "\n");
165 } 173 }
166 if ((pid = fork()) == -1) 174 if ((pid = fork()) == -1)