diff options
| author | edwin <edwin@FreeBSD.org> | 2003-10-15 21:03:16 +0800 |
|---|---|---|
| committer | edwin <edwin@FreeBSD.org> | 2003-10-15 21:03:16 +0800 |
| commit | e5f18cb8ed7ac12756dd44141031306af5a2ebbe (patch) | |
| tree | 8a498f6334fb4c4c980d8276753e2d83a8a14efc /security/op/files | |
| parent | bdfd5e24820cbc34b46f2b87cebb0907c15636ad (diff) | |
| download | freebsd-ports-gnome-e5f18cb8ed7ac12756dd44141031306af5a2ebbe.tar.gz freebsd-ports-gnome-e5f18cb8ed7ac12756dd44141031306af5a2ebbe.tar.zst freebsd-ports-gnome-e5f18cb8ed7ac12756dd44141031306af5a2ebbe.zip | |
unbreak port by eliminating varargs.h
informed maintainer.
Diffstat (limited to 'security/op/files')
| -rw-r--r-- | security/op/files/patch-lex.l | 34 | ||||
| -rw-r--r-- | security/op/files/patch-main.c | 34 |
2 files changed, 61 insertions, 7 deletions
diff --git a/security/op/files/patch-lex.l b/security/op/files/patch-lex.l index a19bdc55ada7..e97039574e36 100644 --- a/security/op/files/patch-lex.l +++ b/security/op/files/patch-lex.l @@ -1,6 +1,11 @@ ---- lex.l.orig Mon Apr 15 23:30:47 2002 -+++ lex.l Mon Apr 15 23:30:18 2002 -@@ -14,6 +14,7 @@ +--- lex.l.orig Wed Oct 15 05:58:41 2003 ++++ lex.l Wed Oct 15 06:01:15 2003 +@@ -10,10 +10,11 @@ + /* +-------------------------------------------------------------------+ */ + + #include <stdio.h> +-#include <varargs.h> ++#include <stdarg.h> #include <ctype.h> #include "defs.h" @@ -8,3 +13,26 @@ static cmd_t *newcmd(); char *savestr(); +@@ -47,20 +48,15 @@ + #include <sys/stat.h> + #include <syslog.h> + +-msg(va_alist) +- va_dcl ++msg(char *s,...) + { +-#if 0 + va_list ap; +- char *s; + +- va_start(ap); +- s = va_arg(ap, char *); ++ va_start(ap,s); + fprintf(stderr,"line %d: ",yyline); + vfprintf(stderr, s, ap); + fputc('\n', stderr); + va_end(ap); +-#endif + } + + static addarg(state, cmd, str) diff --git a/security/op/files/patch-main.c b/security/op/files/patch-main.c index 293434234e76..5d449b8b439f 100644 --- a/security/op/files/patch-main.c +++ b/security/op/files/patch-main.c @@ -1,6 +1,32 @@ ---- main.c.orig Tue Sep 9 01:24:31 2003 -+++ main.c Tue Sep 9 01:29:26 2003 -@@ -448,29 +448,17 @@ +--- main.c.orig Wed Oct 15 05:58:41 2003 ++++ main.c Wed Oct 15 06:02:22 2003 +@@ -9,7 +9,7 @@ + /* +-------------------------------------------------------------------+ */ + + #include <stdio.h> +-#include <varargs.h> ++#include <stdarg.h> + #include <syslog.h> + #include <pwd.h> + #include <grp.h> +@@ -170,14 +170,11 @@ + return Go(new, num, argc, argv); + } + +-fatal(va_alist) +- va_dcl ++fatal(char *s,...) + { + va_list ap; +- char *s; + +- va_start(ap); +- s = va_arg(ap, char *); ++ va_start(ap,s); + vfprintf(stderr, s, ap); + fputc('\n', stderr); + va_end(ap); +@@ -448,29 +445,17 @@ char *cp, *np; struct passwd *pw; struct group *gr; @@ -32,7 +58,7 @@ gidset[ngroups++] = gr->gr_gid; } if (ngroups == 0) -@@ -533,6 +521,18 @@ +@@ -533,6 +518,18 @@ new_envp[curenv++] = environ[i]; } new_envp[curenv] = NULL; |