diff options
| author | des <des@FreeBSD.org> | 2005-06-05 15:40:50 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2005-06-05 15:40:50 +0000 |
| commit | 11a09ab416e21c995885dc0e5847151627094217 (patch) | |
| tree | 7767975616a98948a7ef791c43b28a21711a22c7 /crypto/openssh/scp.c | |
| parent | d5d493f03ae792146848e3cba16bb9e667c73125 (diff) | |
| download | FreeBSD-src-11a09ab416e21c995885dc0e5847151627094217.zip FreeBSD-src-11a09ab416e21c995885dc0e5847151627094217.tar.gz | |
Vendor import of OpenSSH 4.0p1.
Diffstat (limited to 'crypto/openssh/scp.c')
| -rw-r--r-- | crypto/openssh/scp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crypto/openssh/scp.c b/crypto/openssh/scp.c index ef9eaa1..f69fd05 100644 --- a/crypto/openssh/scp.c +++ b/crypto/openssh/scp.c @@ -71,7 +71,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.117 2004/08/11 21:44:32 avsm Exp $"); +RCSID("$OpenBSD: scp.c,v 1.119 2005/01/24 10:22:06 dtucker Exp $"); #include "xmalloc.h" #include "atomicio.h" @@ -108,8 +108,10 @@ pid_t do_cmd_pid = -1; static void killchild(int signo) { - if (do_cmd_pid > 1) + if (do_cmd_pid > 1) { kill(do_cmd_pid, signo); + waitpid(do_cmd_pid, NULL, 0); + } _exit(1); } @@ -726,7 +728,7 @@ sink(int argc, char **argv) #define atime tv[0] #define mtime tv[1] -#define SCREWUP(str) do { why = str; goto screwup; } while (0) +#define SCREWUP(str) { why = str; goto screwup; } setimes = targisdir = 0; mask = umask(0); |
