===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/scp.c,v
retrieving revision 1.113.2.1
retrieving revision 1.113.2.2
diff -u -r1.113.2.1 -r1.113.2.2
--- src/usr.bin/ssh/scp.c	2004/08/19 04:13:27	1.113.2.1
+++ src/usr.bin/ssh/scp.c	2005/03/10 17:15:04	1.113.2.2
@@ -71,7 +71,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.113.2.1 2004/08/19 04:13:27 brad Exp $");
+RCSID("$OpenBSD: scp.c,v 1.113.2.2 2005/03/10 17:15:04 brad Exp $");
 
 #include "xmalloc.h"
 #include "atomicio.h"
@@ -108,8 +108,10 @@
 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);
 }
@@ -721,7 +723,7 @@
 
 #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);