summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>1997-09-10 20:55:09 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>1997-09-10 20:55:09 +0000
commit97275942413dc2735f7beae8c02a110b0ce120b9 (patch)
tree9342186bb7c049caf707c28a09f7a00f238c9e76 /usr.bin
parente9a6544f7eb4ab01c1d4123af6102e992965f6ac (diff)
Die union wait die!
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ftp/cmds.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c
index 3c51f2806de..fd19c959389 100644
--- a/usr.bin/ftp/cmds.c
+++ b/usr.bin/ftp/cmds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmds.c,v 1.23 1997/09/04 04:37:13 millert Exp $ */
+/* $OpenBSD: cmds.c,v 1.24 1997/09/10 20:55:08 millert Exp $ */
/* $NetBSD: cmds.c,v 1.27 1997/08/18 10:20:15 lukem Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.6 (Berkeley) 10/9/94";
#else
-static char rcsid[] = "$OpenBSD: cmds.c,v 1.23 1997/09/04 04:37:13 millert Exp $";
+static char rcsid[] = "$OpenBSD: cmds.c,v 1.24 1997/09/10 20:55:08 millert Exp $";
#endif
#endif /* not lint */
@@ -1221,7 +1221,7 @@ shell(argc, argv)
pid_t pid;
sig_t old1, old2;
char shellnam[MAXPATHLEN], *shell, *namep;
- union wait status;
+ int wait_status;
old1 = signal (SIGINT, SIG_IGN);
old2 = signal (SIGQUIT, SIG_IGN);
@@ -1257,7 +1257,7 @@ shell(argc, argv)
exit(1);
}
if (pid > 0)
- while (wait((int *)&status) != pid)
+ while (wait(&wait_status) != pid)
;
(void)signal(SIGINT, old1);
(void)signal(SIGQUIT, old2);