upstream: correctly quote filenames in verbose output for local->local

copies; from Colin Watson via bz3900; ok dtucker@

OpenBSD-Commit-ID: 5c09b030e2024651ebc8c1f9af6a8a2d37912150
This commit is contained in:
djm@openbsd.org
2025-12-03 06:29:50 +00:00
committed by Damien Miller
parent 8fce5520a1
commit 66622394fd

11
scp.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: scp.c,v 1.269 2025/10/13 00:53:51 djm Exp $ */ /* $OpenBSD: scp.c,v 1.270 2025/12/03 06:29:50 djm Exp $ */
/* /*
* scp - secure remote copy. This is basically patched BSD rcp which * scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd). * uses ssh to do the data transfer (instead of using rcmd).
@@ -216,7 +216,7 @@ suspchild(int signo)
static int static int
do_local_cmd(arglist *a) do_local_cmd(arglist *a)
{ {
u_int i; char *cp;
int status; int status;
pid_t pid; pid_t pid;
@@ -224,10 +224,9 @@ do_local_cmd(arglist *a)
fatal("do_local_cmd: no arguments"); fatal("do_local_cmd: no arguments");
if (verbose_mode) { if (verbose_mode) {
fprintf(stderr, "Executing:"); cp = argv_assemble(a->num, a->list);
for (i = 0; i < a->num; i++) fmprintf(stderr, "Executing: %s\n", cp);
fmprintf(stderr, " %s", a->list[i]); free(cp);
fprintf(stderr, "\n");
} }
if ((pid = fork()) == -1) if ((pid = fork()) == -1)
fatal("do_local_cmd: fork: %s", strerror(errno)); fatal("do_local_cmd: fork: %s", strerror(errno));