Remove WNOHANG flag from wait3().
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:
parent
7bec141b12
commit
e1e9ba3370
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=207453
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user