diff options
author | Colin Watson <cjwatson@debian.org> | 2016-12-20 00:22:52 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-12-20 00:22:52 +0000 |
commit | 971a7653746a6972b907dfe0ce139c06e4a6f482 (patch) | |
tree | 70fb964265d57ae4967be55b75dbb2a122e9b969 /openbsd-compat/bsd-waitpid.c | |
parent | a8ed8d256b2e2c05b0c15565a7938028c5192277 (diff) | |
parent | 4a354fc231174901f2629437c2a6e924a2dd6772 (diff) |
Import openssh_7.4p1.orig.tar.gz
Diffstat (limited to 'openbsd-compat/bsd-waitpid.c')
-rw-r--r-- | openbsd-compat/bsd-waitpid.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openbsd-compat/bsd-waitpid.c b/openbsd-compat/bsd-waitpid.c index 40e6ffaa8..113fb1ea9 100644 --- a/openbsd-compat/bsd-waitpid.c +++ b/openbsd-compat/bsd-waitpid.c | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | 26 | ||
27 | #ifndef HAVE_WAITPID | 27 | #ifndef HAVE_WAITPID |
28 | #include <errno.h> | 28 | #include <errno.h> |
29 | #include <sys/wait.h> | 29 | #include <sys/wait.h> |
30 | #include "bsd-waitpid.h" | 30 | #include "bsd-waitpid.h" |
@@ -43,11 +43,11 @@ waitpid(int pid, int *stat_loc, int options) | |||
43 | /* wait4() wants pid=0 for indiscriminate wait. */ | 43 | /* wait4() wants pid=0 for indiscriminate wait. */ |
44 | pid = 0; | 44 | pid = 0; |
45 | } | 45 | } |
46 | wait_pid = wait4(pid, &statusp, options, NULL); | 46 | wait_pid = wait4(pid, &statusp, options, NULL); |
47 | if (stat_loc) | 47 | if (stat_loc) |
48 | *stat_loc = (int) statusp.w_status; | 48 | *stat_loc = (int) statusp.w_status; |
49 | 49 | ||
50 | return (wait_pid); | 50 | return (wait_pid); |
51 | } | 51 | } |
52 | 52 | ||
53 | #endif /* !HAVE_WAITPID */ | 53 | #endif /* !HAVE_WAITPID */ |