diff options
Diffstat (limited to 'net/socks4/patches/patch-af')
| -rw-r--r-- | net/socks4/patches/patch-af | 48 |
1 files changed, 45 insertions, 3 deletions
diff --git a/net/socks4/patches/patch-af b/net/socks4/patches/patch-af index 4882435fd7a..36bffa3fa8e 100644 --- a/net/socks4/patches/patch-af +++ b/net/socks4/patches/patch-af @@ -1,9 +1,18 @@ -$NetBSD: patch-af,v 1.1 1999/08/05 13:09:28 agc Exp $ +$NetBSD: patch-af,v 1.2 2004/09/08 15:03:15 sketch Exp $ Solaris 2.6 appears to have herror(), so don't redefine it. ---- rftp/ftp.c 1999/08/05 12:56:00 1.1 -+++ rftp/ftp.c 1999/08/05 12:56:45 +--- rftp/ftp.c.orig 1995-09-07 03:24:03.000000000 +0100 ++++ rftp/ftp.c 2004-09-08 15:55:37.000000000 +0100 +@@ -74,7 +74,7 @@ + #include <netdb.h> + #include <fcntl.h> + #include <pwd.h> +-#include <varargs.h> ++#include <stdarg.h> + + #ifdef FASCIST + #include <syslog.h> @@ -112,7 +112,7 @@ FILE *cin, *cout; FILE *dataconn(); @@ -13,3 +22,36 @@ Solaris 2.6 appears to have herror(), so don't redefine it. /* >>> YDL */ #if !defined(BSD) || (BSD - 43 <= 0) +@@ -358,11 +358,9 @@ + } + + /*VARARGS*/ +-command(va_alist) +-va_dcl ++command(char *fmt, ...) + { + va_list ap; +- char *fmt; + int r; + sig_t oldintr; + void cmdabort(); +@@ -370,8 +368,7 @@ + abrtflag = 0; + if (debug) { + printf("---> "); +- va_start(ap); +- fmt = va_arg(ap, char *); ++ va_start(ap, fmt); + if (strncmp("PASS ", fmt, 5) == 0) + printf("PASS XXXX"); + else +@@ -386,8 +383,7 @@ + return (0); + } + oldintr = signal(SIGINT, cmdabort); +- va_start(ap); +- fmt = va_arg(ap, char *); ++ va_start(ap, fmt); + vfprintf(cout, fmt, ap); + va_end(ap); + fprintf(cout, "\r\n"); |