diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2003-07-25 22:36:42 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2003-07-25 22:36:42 +0000 |
| commit | cdd9fb7a3fd80accca9c6a3d1908865a8f7feb2e (patch) | |
| tree | 8a870c3767beff2aa41201cf6e06088f3814d99e /net/sup | |
| parent | 10c43988bde911285c830a700efd9f8419e1e17f (diff) | |
| download | ports-cdd9fb7a3fd80accca9c6a3d1908865a8f7feb2e.tar.gz ports-cdd9fb7a3fd80accca9c6a3d1908865a8f7feb2e.zip | |
Fix build on -current
PR: 54871
Submitted by: Clement Laforet <sheepkiller@cultdeadsheep.org>
Approved by: fjoe (mentor) (implicit)
Notes
Notes:
svn path=/head/; revision=85603
Diffstat (limited to 'net/sup')
| -rw-r--r-- | net/sup/files/patch-quit.c | 25 | ||||
| -rw-r--r-- | net/sup/files/patch-run.c | 43 |
2 files changed, 58 insertions, 10 deletions
diff --git a/net/sup/files/patch-quit.c b/net/sup/files/patch-quit.c new file mode 100644 index 000000000000..85356a4a42cf --- /dev/null +++ b/net/sup/files/patch-quit.c @@ -0,0 +1,25 @@ +--- quit.c.orig Fri Jul 25 23:20:04 2003 ++++ quit.c Fri Jul 25 23:22:08 2003 +@@ -50,17 +50,15 @@ + */ + + #include <stdio.h> +-#include <varargs.h> ++#include <stdarg.h> + +-quit (status, fmt, va_alist) +-int status; +-char *fmt; +-va_dcl ++quit (char *fmt,...) + { ++ int status; ++ char *fmt; + va_list args; +- + fflush(stdout); +- va_start(args); ++ va_start(args,fmt); + (void) vfprintf(stderr, fmt, args); + va_end(args); + exit(status); diff --git a/net/sup/files/patch-run.c b/net/sup/files/patch-run.c index d57f77daf692..7caf075f680e 100644 --- a/net/sup/files/patch-run.c +++ b/net/sup/files/patch-run.c @@ -1,23 +1,46 @@ ---- run.c.orig Fri Aug 20 20:46:33 1993 -+++ run.c Fri Oct 25 10:23:26 2002 -@@ -95,6 +95,7 @@ +--- run.c.orig Sat Aug 21 02:46:33 1993 ++++ run.c Fri Jul 25 23:23:43 2003 +@@ -94,18 +94,17 @@ + #include <stdio.h> #include <signal.h> #include <sys/wait.h> - #include <varargs.h> +-#include <varargs.h> ++#include <stdarg.h> +#define MAXARGS 100 static int dorun(); -@@ -123,10 +124,14 @@ +-int run (name,va_alist) +-char *name; +-va_dcl ++int run (char *name,...) + { + int val; + va_list ap; + +- va_start(ap); ++ va_start(ap,name); + val = runv (name,ap); + va_end(ap); + return(val); +@@ -117,16 +116,18 @@ + return (dorun (name, argv, 0)); + } + +-int runp (name,va_alist) +-char *name; +-va_dcl ++int runp (char *name,...) { int val; va_list ap; - +- va_start(ap); +- val = runvp (name,ap); + char *args[MAXARGS]; + int argno=0; + - va_start(ap); -- val = runvp (name,ap); ++ va_start(ap,name); + while (argno < MAXARGS + && (args[argno++] = va_arg(ap, char *)) != (char *)0); va_end(ap); @@ -25,7 +48,7 @@ return (val); } -@@ -144,7 +149,7 @@ +@@ -144,7 +145,7 @@ int wpid; register int pid; struct sigvec ignoresig,intsig,quitsig; @@ -34,7 +57,7 @@ int execvp(), execv(); int (*execrtn)() = usepath ? execvp : execv; -@@ -165,7 +170,7 @@ +@@ -165,7 +166,7 @@ sigvec (SIGINT,&ignoresig,&intsig); sigvec (SIGQUIT,&ignoresig,&quitsig); do { @@ -43,7 +66,7 @@ if (WIFSTOPPED (status)) { kill (0,SIGTSTP); wpid = 0; -@@ -174,8 +179,8 @@ +@@ -174,8 +175,8 @@ sigvec (SIGINT,&intsig,0); /* restore signals */ sigvec (SIGQUIT,&quitsig,0); |