diff options
| -rw-r--r-- | ftp/ncftp/files/patch-sys.h | 10 | ||||
| -rw-r--r-- | ftp/ncftp1/files/patch-sys.h | 10 | ||||
| -rw-r--r-- | mail/mailx/files/patch-cmd2.c | 20 | ||||
| -rw-r--r-- | mail/mailx/files/patch-fio.c | 20 | ||||
| -rw-r--r-- | mail/mailx/files/patch-popen.c | 43 | ||||
| -rw-r--r-- | misc/lile/files/patch-aa | 58 | ||||
| -rw-r--r-- | shells/44bsd-csh/files/patch-proc.c | 50 |
7 files changed, 204 insertions, 7 deletions
diff --git a/ftp/ncftp/files/patch-sys.h b/ftp/ncftp/files/patch-sys.h new file mode 100644 index 000000000000..8d65c5ddc96c --- /dev/null +++ b/ftp/ncftp/files/patch-sys.h @@ -0,0 +1,10 @@ +--- sys.h.orig Tue Jun 4 21:12:36 2002 ++++ sys.h Tue Jun 4 21:12:44 2002 +@@ -423,7 +423,6 @@ + # define HERROR 1 + # define TERMIOS 1 + # define HAS_GETCWD 1 +-# define U_WAIT 1 + # define NO_CONST 1 /* avoid prototype conflict */ + #endif + diff --git a/ftp/ncftp1/files/patch-sys.h b/ftp/ncftp1/files/patch-sys.h new file mode 100644 index 000000000000..8d65c5ddc96c --- /dev/null +++ b/ftp/ncftp1/files/patch-sys.h @@ -0,0 +1,10 @@ +--- sys.h.orig Tue Jun 4 21:12:36 2002 ++++ sys.h Tue Jun 4 21:12:44 2002 +@@ -423,7 +423,6 @@ + # define HERROR 1 + # define TERMIOS 1 + # define HAS_GETCWD 1 +-# define U_WAIT 1 + # define NO_CONST 1 /* avoid prototype conflict */ + #endif + diff --git a/mail/mailx/files/patch-cmd2.c b/mail/mailx/files/patch-cmd2.c new file mode 100644 index 000000000000..e99b5f35c967 --- /dev/null +++ b/mail/mailx/files/patch-cmd2.c @@ -0,0 +1,20 @@ +--- cmd2.c Sun Mar 8 04:46:25 1998 ++++ cmd2.c Tue Jun 4 20:59:44 2002 +@@ -367,7 +367,7 @@ + core() + { + int pid; +- extern union wait wait_status; ++ extern int wait_status; + + switch (pid = vfork()) { + case -1: +@@ -380,7 +380,7 @@ + printf("Okie dokie"); + fflush(stdout); + wait_child(pid); +- if (wait_status.w_coredump) ++ if (WCOREDUMP(wait_status)) + printf(" -- Core dumped.\n"); + else + printf(" -- Can't dump core.\n"); diff --git a/mail/mailx/files/patch-fio.c b/mail/mailx/files/patch-fio.c new file mode 100644 index 000000000000..b33b93648794 --- /dev/null +++ b/mail/mailx/files/patch-fio.c @@ -0,0 +1,20 @@ +--- fio.c Tue Jun 4 21:05:13 2002 ++++ fio.c Tue Jun 4 21:05:42 2002 +@@ -313,7 +313,7 @@ + register char *cp, *shell; + int pivec[2]; + struct stat sbuf; +- extern union wait wait_status; ++ extern int wait_status; + + /* + * The order of evaluation is "%" and "#" expand into constants. +@@ -365,7 +365,7 @@ + close(pivec[1]); + l = read(pivec[0], xname, BUFSIZ); + close(pivec[0]); +- if (wait_child(pid) < 0 && wait_status.w_termsig != SIGPIPE) { ++ if (wait_child(pid) < 0 && WTERMSIG(wait_status) != SIGPIPE) { + fprintf(stderr, "\"%s\": Expansion failed.\n", name); + return NOSTR; + } diff --git a/mail/mailx/files/patch-popen.c b/mail/mailx/files/patch-popen.c new file mode 100644 index 000000000000..ec49cf92886e --- /dev/null +++ b/mail/mailx/files/patch-popen.c @@ -0,0 +1,43 @@ +--- popen.c Fri May 27 08:32:06 1994 ++++ popen.c Tue Jun 4 21:07:45 2002 +@@ -55,7 +55,7 @@ + int pid; + char done; + char free; +- union wait status; ++ int status; + struct child *link; + }; + static struct child *child; +@@ -320,11 +320,11 @@ + int signo; + { + int pid; +- union wait status; ++ int status; + register struct child *cp; + + while ((pid = +- wait3((int *)&status, WNOHANG, (struct rusage *)0)) > 0) { ++ wait3(&status, WNOHANG, (struct rusage *)0)) > 0) { + cp = findchild(pid); + if (cp->free) + delchild(cp); +@@ -335,7 +335,7 @@ + } + } + +-union wait wait_status; ++int wait_status; + + /* + * Wait for a specific child to die. +@@ -352,7 +352,7 @@ + wait_status = cp->status; + delchild(cp); + sigsetmask(mask); +- return wait_status.w_status ? -1 : 0; ++ return wait_status ? -1 : 0; + } + + /* diff --git a/misc/lile/files/patch-aa b/misc/lile/files/patch-aa index 486576b625f3..c79a2cba80ee 100644 --- a/misc/lile/files/patch-aa +++ b/misc/lile/files/patch-aa @@ -1,5 +1,5 @@ ---- dist/ile.c Wed Jun 9 13:12:33 1993 -+++ ile.c Sat Jan 20 08:23:07 2001 +--- ile.c Tue Jun 8 23:12:33 1993 ++++ ile.c Tue Jun 4 20:34:21 2002 @@ -51,7 +51,7 @@ #include <errno.h> #include <sys/ioctl.h> @@ -26,16 +26,60 @@ int tty_ldisc; int tty_mode; -@@ -269,8 +268,10 @@ +@@ -267,44 +266,46 @@ + did, i.e., suspend, abort, exit with the proper status etc. + */ void handle_child() { - union wait status; +- union wait status; ++ int status; -- if (wait3(&status, WUNTRACED, NULL) != childpid) { -+ if (wait3(&status.w_status, WUNTRACED, NULL) != childpid) { + if (wait3(&status, WUNTRACED, NULL) != childpid) { fprintf(stderr, "ile: notified by unknown process\r\n"); + /* note the change so that we don't die after select */ + expect_exception = TRUE; return; } - + if (WIFSTOPPED(status)) { + /* ignore stop signals that we forwarded to the child */ +- if (status.w_stopsig == SIGSTOP && ignorestop) { ++ if (WSTOPSIG(status) == SIGSTOP && ignorestop) { + ignorestop = FALSE; + return; + } + + #ifdef DEBUG +- fprintf(stderr, "child stopped by signal %d\r\n", status.w_stopsig); ++ fprintf(stderr, "child stopped by signal %d\r\n", WSTOPSIG(status)); + #endif + /* stop ourselves */ +- handle_stop(status.w_stopsig); ++ handle_stop(WSTOPSIG(status)); + } + else if (WIFSIGNALED(status)) { + #ifdef DEBUG +- fprintf(stderr, "child killed by signal %d\r\n", status.w_termsig); ++ fprintf(stderr, "child killed by signal %d\r\n", WTERMSIG(status)); + #endif + clean_up(); + +- if (status.w_coredump) { ++ if (WCOREDUMP(status)) { + chdir ("/"); /* prevent own core dump */ + } +- (void) signal (status.w_termsig, SIG_DFL); +- kill (getpid(), status.w_termsig); ++ (void) signal (WTERMSIG(status), SIG_DFL); ++ kill (getpid(), WTERMSIG(status)); + } + else { + #ifdef DEBUG +- fprintf(stderr, "child exited with %d\r\n", status.w_retcode); ++ fprintf(stderr, "child exited with %d\r\n", WEXITSTATUS(status)); + #endif + clean_up(); +- exit (status.w_retcode); ++ exit (WEXITSTATUS(status)); + } + } + diff --git a/shells/44bsd-csh/files/patch-proc.c b/shells/44bsd-csh/files/patch-proc.c new file mode 100644 index 000000000000..d938524ed34f --- /dev/null +++ b/shells/44bsd-csh/files/patch-proc.c @@ -0,0 +1,50 @@ +$FreeBSD$ + +--- proc.c Tue Jun 4 20:07:29 2002 ++++ proc.c Tue Jun 4 20:14:09 2002 +@@ -89,13 +89,13 @@ + int pid; + extern int insource; + int save_errno = errno; +- union wait w; ++ int w; + int jobflags; + struct rusage ru; + + loop: + errno = 0; /* reset, just in case */ +- pid = wait3(&w.w_status, ++ pid = wait3(&w, + (setintr && (intty || insource) ? WNOHANG | WUNTRACED : WNOHANG), &ru); + + if (pid <= 0) { +@@ -117,7 +117,7 @@ + pp->p_flags &= ~(PRUNNING | PSTOPPED | PREPORTED); + if (WIFSTOPPED(w)) { + pp->p_flags |= PSTOPPED; +- pp->p_reason = w.w_stopsig; ++ pp->p_reason = WSTOPSIG(w); + } + else { + if (pp->p_flags & (PTIME | PPTIME) || adrof(STRtime)) +@@ -125,16 +125,16 @@ + + pp->p_rusage = ru; + if (WIFSIGNALED(w)) { +- if (w.w_termsig == SIGINT) ++ if (WTERMSIG(w) == SIGINT) + pp->p_flags |= PINTERRUPTED; + else + pp->p_flags |= PSIGNALED; +- if (w.w_coredump) ++ if (WCOREDUMP(w)) + pp->p_flags |= PDUMPED; +- pp->p_reason = w.w_termsig; ++ pp->p_reason = WTERMSIG(w); + } + else { +- pp->p_reason = w.w_retcode; ++ pp->p_reason = WEXITSTATUS(w); + if (pp->p_reason != 0) + pp->p_flags |= PAEXITED; + else |