From ec10002d16340eee007c7973ebaa6dcdb4a3aea8 Mon Sep 17 00:00:00 2001 From: Eivind Eklund Date: Fri, 12 Feb 1999 14:42:31 +0000 Subject: Merge from OpenBSD up to rev 1.5 (matches NetBSD up to rev 1.3): * Clean up waitpid parameter handling. --- usr.bin/apply/apply.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'usr.bin/apply') diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c index 3f0727d372c0f..5499becd3055c 100644 --- a/usr.bin/apply/apply.c +++ b/usr.bin/apply/apply.c @@ -190,9 +190,8 @@ system(command) const char *command; { static char *name, *shell; - union wait pstat; pid_t pid; - int omask; + int omask, pstat; sig_t intsave, quitsave; if (shell == NULL) { @@ -217,11 +216,11 @@ system(command) } intsave = signal(SIGINT, SIG_IGN); quitsave = signal(SIGQUIT, SIG_IGN); - pid = waitpid(pid, (int *)&pstat, 0); + pid = waitpid(pid, &pstat, 0); (void)sigsetmask(omask); (void)signal(SIGINT, intsave); (void)signal(SIGQUIT, quitsave); - return(pid == -1 ? -1 : pstat.w_status); + return(pid == -1 ? -1 : pstat); } void -- cgit v1.3