Merge 4.0p1 to the trunk.

1 files changed, 5 insertions, 3 deletions

diff --git a/scp.c b/scp.c
index ef9eaa1a4..f69fd05fc 100644
--- a/scp.c
+++ b/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);