head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.106 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.104 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.102 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.100 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.98 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.96 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.94 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.92 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.90 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.88 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.86 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.84 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.82 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.80 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.78 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.76 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.74 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.72 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.70 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.68 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.66 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.64 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.62 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.58 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.38 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.60 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.56 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.54 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.52 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.50 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.48 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.46 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.44 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.42 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.40 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.36 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.34 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.32 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.30 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.28 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.26 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.24 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.22 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.20 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.18 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.16 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.14 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.12 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.10 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.8 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.6 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.4 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.2 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.3.0.60 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.58 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.56 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.54 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.52 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.50 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.48 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.46 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.44 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.42 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.40 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.38 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.36 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.34 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.32 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.30 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.28 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.26 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.24 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.22 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.20 pkgsrc-2008Q1:1.3.0.18 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.16 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.14 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.12 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.10 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.8 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.6 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.4 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.2 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.2.0.12 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.10 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.8 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.6 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.4 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.2 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1 netbsd-1-5-PATCH001:1.1 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1; locks; strict; comment @# @; 1.4 date 2013.03.02.18.29.48; author joerg; state Exp; branches; next 1.3; 1.3 date 2005.12.27.13.48.56; author joerg; state Exp; branches; next 1.2; 1.2 date 2004.09.08.15.03.15; author sketch; state Exp; branches; next 1.1; 1.1 date 99.08.05.13.09.28; author agc; state Exp; branches; next ; desc @@ 1.4 log @Fix return types. @ text @$NetBSD: patch-af,v 1.3 2005/12/27 13:48:56 joerg Exp $ --- 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 #include #include -#include +#include #ifdef FASCIST #include @@@@ -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(); -#if !defined(SVR3) && !defined(BIND_RESOLVER) && !defined(LINUX) +#if !defined(SVR3) && !defined(BIND_RESOLVER) && !defined(LINUX) && !defined(SOLARIS) /* >>> YDL */ #if !defined(BSD) || (BSD - 43 <= 0) @@@@ -158,6 +158,9 @@@@ herror(s) #endif /* !defined(SVR3) && !defined(BIND_RESOLVER) && !defined(LINUX) */ +int command(char *fmt, ...); +void proxtrans(char *cmd, char *local, char *remote); + char * hookup(host, port) @@@@ -358,11 +361,10 @@@@ cmdabort() } /*VARARGS*/ -command(va_alist) -va_dcl +int +command(char *fmt, ...) { va_list ap; - char *fmt; int r; sig_t oldintr; void cmdabort(); @@@@ -370,8 +372,7 @@@@ va_dcl 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 +387,7 @@@@ va_dcl 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"); @@@@ -533,9 +533,7 @@@@ abortsend() #define HASHBYTES 1024 -sendrequest(cmd, local, remote, printnames) - char *cmd, *local, *remote; - int printnames; +void sendrequest(char *cmd, char *local, char *remote, int printnames) { struct stat st; struct timeval start, stop; @@@@ -792,8 +790,7 @@@@ abortrecv() longjmp(recvabort, 1); } -recvrequest(cmd, local, remote, lmode, printnames) - char *cmd, *local, *remote, *lmode; +void recvrequest(char *cmd, char *local, char *remote, char *lmode, char *printnames) { FILE *fout, *din = 0, *popen(); int (*closefunc)(), pclose(), fclose(); @@@@ -1320,8 +1317,7 @@@@ psabort() abrtflag++; } -pswitch(flag) - int flag; +void pswitch(int flag) { extern int proxy, abrtflag; sig_t oldintr; @@@@ -1427,8 +1423,7 @@@@ abortpt() longjmp(ptabort, 1); } -proxtrans(cmd, local, remote) - char *cmd, *local, *remote; +void proxtrans(char *cmd, char *local, char *remote) { sig_t oldintr; int secndflag = 0, prox_type, nfnd; @ 1.3 log @Fix errno. Fix GCC 3.4+ due to mismatch between implied and real prototype. Add DragonFly. @ text @d1 1 a1 1 $NetBSD$ d29 1 a29 1 @@@@ -158,6 +158,8 @@@@ herror(s) d34 1 d39 1 a39 1 @@@@ -358,11 +360,10 @@@@ cmdabort() d53 1 a53 1 @@@@ -370,8 +371,7 @@@@ va_dcl d63 1 a63 1 @@@@ -386,8 +386,7 @@@@ va_dcl d73 41 @ 1.2 log @varargs->stdarg, fixes build with GCC3. Add dante to CONFLICTS as they install files with the same name (dante already has socks4 in its own CONFLICTS). @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.1 1999/08/05 13:09:28 agc Exp $ d3 3 a5 5 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 @@@@ d14 7 a20 1 @@@@ -112,7 +112,7 @@@@ d29 10 a38 1 @@@@ -358,11 +358,9 @@@@ d44 1 d52 1 a52 1 @@@@ -370,8 +368,7 @@@@ d62 1 a62 1 @@@@ -386,8 +383,7 @@@@ @ 1.1 log @Make this package work on Solaris: + Makefile patches to work out what OS is being used. + Solaris 2.6 (at least) has herror, so don't try to redefine it + Pass down CC value from package Makefile + Don't pass down Zoularis CPPFLAGS from package Makefile + Regen patch-sum file @ text @d1 1 a1 1 $NetBSD$ d5 11 a15 2 --- rftp/ftp.c 1999/08/05 12:56:00 1.1 +++ rftp/ftp.c 1999/08/05 12:56:45 d25 33 @