diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | openbsd-compat/bsd-nextstep.c | 5 | ||||
-rw-r--r-- | openbsd-compat/bsd-waitpid.c | 6 |
3 files changed, 10 insertions, 5 deletions
@@ -1,5 +1,7 @@ | |||
1 | 20010327 | 1 | 20010327 |
2 | - Attempt sync with sshlogin.c w/ OpenBSD (mainly CVS ID) | 2 | - Attempt sync with sshlogin.c w/ OpenBSD (mainly CVS ID) |
3 | - Fix pointer issues in waitpid() and wait() replaces. Patch by Lutz | ||
4 | Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> | ||
3 | 5 | ||
4 | 20010324 | 6 | 20010324 |
5 | - Fixed permissions ssh-keyscan. Thanks to Christopher Linn <celinn@mtu.edu>. | 7 | - Fixed permissions ssh-keyscan. Thanks to Christopher Linn <celinn@mtu.edu>. |
@@ -4708,4 +4710,4 @@ | |||
4708 | - Wrote replacements for strlcpy and mkdtemp | 4710 | - Wrote replacements for strlcpy and mkdtemp |
4709 | - Released 1.0pre1 | 4711 | - Released 1.0pre1 |
4710 | 4712 | ||
4711 | $Id: ChangeLog,v 1.1016 2001/03/26 05:32:16 mouring Exp $ | 4713 | $Id: ChangeLog,v 1.1017 2001/03/26 05:35:33 mouring Exp $ |
diff --git a/openbsd-compat/bsd-nextstep.c b/openbsd-compat/bsd-nextstep.c index 64962d013..85b298a48 100644 --- a/openbsd-compat/bsd-nextstep.c +++ b/openbsd-compat/bsd-nextstep.c | |||
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | #include "includes.h" | 23 | #include "includes.h" |
24 | 24 | ||
25 | RCSID("$Id: bsd-nextstep.c,v 1.3 2001/02/09 01:55:36 djm Exp $"); | 25 | RCSID("$Id: bsd-nextstep.c,v 1.4 2001/03/26 05:35:34 mouring Exp $"); |
26 | 26 | ||
27 | #ifdef HAVE_NEXT | 27 | #ifdef HAVE_NEXT |
28 | #include <errno.h> | 28 | #include <errno.h> |
@@ -37,7 +37,8 @@ posix_wait(int *status) | |||
37 | 37 | ||
38 | #undef wait /* Use NeXT's wait() function */ | 38 | #undef wait /* Use NeXT's wait() function */ |
39 | wait_pid = wait(&statusp); | 39 | wait_pid = wait(&statusp); |
40 | status = (int *) statusp.w_status; | 40 | if (status) |
41 | *status = (int) statusp.w_status; | ||
41 | 42 | ||
42 | return wait_pid; | 43 | return wait_pid; |
43 | } | 44 | } |
diff --git a/openbsd-compat/bsd-waitpid.c b/openbsd-compat/bsd-waitpid.c index 1a96bbf7f..47b4446dc 100644 --- a/openbsd-compat/bsd-waitpid.c +++ b/openbsd-compat/bsd-waitpid.c | |||
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | #include "includes.h" | 23 | #include "includes.h" |
24 | 24 | ||
25 | RCSID("$Id: bsd-waitpid.c,v 1.2 2001/02/09 01:55:36 djm Exp $"); | 25 | RCSID("$Id: bsd-waitpid.c,v 1.3 2001/03/26 05:35:34 mouring Exp $"); |
26 | 26 | ||
27 | #ifndef HAVE_WAITPID | 27 | #ifndef HAVE_WAITPID |
28 | #include <errno.h> | 28 | #include <errno.h> |
@@ -43,7 +43,9 @@ waitpid(int pid, int *stat_loc, int options) | |||
43 | pid = 0; /* wait4() wants pid=0 for indiscriminate wait. */ | 43 | pid = 0; /* wait4() wants pid=0 for indiscriminate wait. */ |
44 | } | 44 | } |
45 | wait_pid = wait4(pid, &statusp, options, NULL); | 45 | wait_pid = wait4(pid, &statusp, options, NULL); |
46 | stat_loc = (int *)statusp.w_status; | 46 | if (stat_loc) |
47 | *stat_loc = (int) statusp.w_status; | ||
48 | |||
47 | return wait_pid; | 49 | return wait_pid; |
48 | } | 50 | } |
49 | 51 | ||