diff options
Diffstat (limited to 'net/socks4/patches/patch-af')
| -rw-r--r-- | net/socks4/patches/patch-af | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/net/socks4/patches/patch-af b/net/socks4/patches/patch-af index 36bffa3fa8e..424c6fb1992 100644 --- a/net/socks4/patches/patch-af +++ b/net/socks4/patches/patch-af @@ -1,10 +1,8 @@ -$NetBSD: patch-af,v 1.2 2004/09/08 15:03:15 sketch Exp $ +$NetBSD: patch-af,v 1.3 2005/12/27 13:48:56 joerg Exp $ -Solaris 2.6 appears to have herror(), so don't redefine it. - ---- 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 @@ +--- rftp/ftp.c.orig 1995-09-07 02:24:03.000000000 +0000 ++++ rftp/ftp.c +@@ -74,7 +74,7 @@ static char sccsid[] = "@(#)ftp.c 5.38 ( #include <netdb.h> #include <fcntl.h> #include <pwd.h> @@ -13,7 +11,13 @@ Solaris 2.6 appears to have herror(), so don't redefine it. #ifdef FASCIST #include <syslog.h> -@@ -112,7 +112,7 @@ +@@ -107,12 +107,12 @@ unsigned long socks_bind_remoteAddr; /* + int pasvmode = 0; + + extern char *strerror(); +-extern int connected, errno; ++extern int connected; + FILE *cin, *cout; FILE *dataconn(); @@ -22,12 +26,22 @@ Solaris 2.6 appears to have herror(), so don't redefine it. /* >>> YDL */ #if !defined(BSD) || (BSD - 43 <= 0) -@@ -358,11 +358,9 @@ +@@ -158,6 +158,8 @@ herror(s) + + #endif /* !defined(SVR3) && !defined(BIND_RESOLVER) && !defined(LINUX) */ + ++int command(char *fmt, ...); ++ + + char * + hookup(host, port) +@@ -358,11 +360,10 @@ cmdabort() } /*VARARGS*/ -command(va_alist) -va_dcl ++int +command(char *fmt, ...) { va_list ap; @@ -35,7 +49,7 @@ Solaris 2.6 appears to have herror(), so don't redefine it. int r; sig_t oldintr; void cmdabort(); -@@ -370,8 +368,7 @@ +@@ -370,8 +371,7 @@ va_dcl abrtflag = 0; if (debug) { printf("---> "); @@ -45,7 +59,7 @@ Solaris 2.6 appears to have herror(), so don't redefine it. if (strncmp("PASS ", fmt, 5) == 0) printf("PASS XXXX"); else -@@ -386,8 +383,7 @@ +@@ -386,8 +386,7 @@ va_dcl return (0); } oldintr = signal(SIGINT, cmdabort); |