diff options
Diffstat (limited to 'security/srp_client/patches/patch-ac')
| -rw-r--r-- | security/srp_client/patches/patch-ac | 51 |
1 files changed, 45 insertions, 6 deletions
diff --git a/security/srp_client/patches/patch-ac b/security/srp_client/patches/patch-ac index aaddb1d61a7..9c5eb021b3c 100644 --- a/security/srp_client/patches/patch-ac +++ b/security/srp_client/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/06/18 19:18:18 jlam Exp $ +$NetBSD: patch-ac,v 1.2 2004/09/08 14:30:00 markd Exp $ Rename setmode (and clearmode for consistency) to avoid clash with unistd.h. ---- telnet/telnet/commands.c.orig Thu Dec 10 17:50:48 1998 -+++ telnet/telnet/commands.c Fri Jun 18 06:59:32 1999 -@@ -64,6 +64,7 @@ +--- telnet/telnet/commands.c.orig 1998-12-11 11:50:48.000000000 +1300 ++++ telnet/telnet/commands.c +@@ -64,11 +64,12 @@ static char sccsid[] = "@(#)commands.c 8 #include <fcntl.h> #endif /* CRAY */ @@ -12,7 +12,23 @@ Rename setmode (and clearmode for consistency) to avoid clash with unistd.h. #include <signal.h> #include <netdb.h> #include <ctype.h> -@@ -1156,13 +1157,13 @@ + #include <pwd.h> +-#include <varargs.h> ++#include <stdarg.h> + #include <errno.h> + + #include <arpa/telnet.h> +@@ -110,7 +111,8 @@ extern int isprefix(); + extern char **genget(); + extern int Ambiguous(); + +-static call(); ++typedef int (*intrtn_t) __P((int, char *[])); ++static call(intrtn_t, ...); + + typedef struct { + char *name; /* command name */ +@@ -1156,13 +1158,13 @@ dolmmode(bit, on) } int @@ -28,7 +44,7 @@ Rename setmode (and clearmode for consistency) to avoid clash with unistd.h. { return dolmmode(bit, 0); } -@@ -1188,18 +1189,18 @@ +@@ -1188,18 +1190,18 @@ static struct modelist ModeList[] = { #endif { "", "", 0 }, { "", "These require the LINEMODE option to be enabled", 0 }, @@ -59,3 +75,26 @@ Rename setmode (and clearmode for consistency) to avoid clash with unistd.h. { "help", 0, modehelp, 0 }, #ifdef KLUDGELINEMODE { "kludgeline", 0, dokludgemode, 1 }, +@@ -2607,19 +2609,14 @@ static Command cmdtab2[] = { + * Call routine with argc, argv set from args (terminated by 0). + */ + +- /*VARARGS1*/ +- static +-call(va_alist) +- va_dcl ++static int ++call(intrtn_t routine, ...) + { + va_list ap; +- typedef int (*intrtn_t)(); +- intrtn_t routine; + char *args[100]; + int argno = 0; + +- va_start(ap); +- routine = (va_arg(ap, intrtn_t)); ++ va_start(ap, routine); + while ((args[argno++] = va_arg(ap, char *)) != 0) { + ; + } |