d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove WNOHANG flag from wait3().

Browse Source 
Because script(1) now reliably terminates when the TTY is closed, it may
be the case that the call to wait3() occurs just before the child
process exits. This causes error codes to be ignored.

Just change script(1) to use waitpid() instead of wait3(). This makes it
more portable and prevents the need for a loop, since waitpid() only
returns a specified process.

PR:		bin/146189
Tested by:	amdmi3@, older version
MFC after:	2 weeks
This commit is contained in:
Ed Schouten 2010-04-30 22:33:49 +00:00
parent 7bec141b12
commit e1e9ba3370
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.bin/script/script.c
View File

@ -219,24 +219,18 @@ usage(void)
void
finish(void)
{
pid_t pid;
int die, e, status;
int e, status;
die = e = 0;
while ((pid = wait3(&status, WNOHANG, 0)) > 0)
if (pid == child) {
die = 1;
if (waitpid(child, &status, 0) == child) {
if (WIFEXITED(status))
e = WEXITSTATUS(status);
else if (WIFSIGNALED(status))
e = WTERMSIG(status);
else /* can't happen */
e = 1;
}
if (die)
done(e);
}
}
void
doshell(char **av)