Import tnftp 20050103.

Various changes, including:
	* forbid mget of filenames that aren't in or below the local cwd.
	* improve auto-fetch transfers
	* improve www/proxy authentication support
	* improve http response header parsing
	* change UCB-licensed code from 4-clause to 3-clause

1 files changed, 80 insertions, 57 deletions

diff --git a/net/tnftp/files/configure.in b/net/tnftp/files/configure.in
index ff905893971..8fa9a2cf8c3 100644
--- a/net/tnftp/files/configure.in
+++ b/net/tnftp/files/configure.in
@@ -1,10 +1,10 @@
-dnl $Id: configure.in,v 1.1.1.1 2003/08/25 11:47:23 lukem Exp $
+dnl $Id: configure.in,v 1.1.1.2 2003/10/06 01:09:12 lukem Exp $
 dnl
 dnl configure.in --
 dnl	process this file with autoconf to produce a configure script.
 dnl
 
-AC_REVISION($Revision: 1.1.1.1 $)dnl
+AC_REVISION($Revision: 1.1.1.2 $)dnl
 
 AC_INIT(tnftp.h)
 
@@ -70,49 +70,60 @@ AC_HEADER_TIME
 AC_TYPE_OFF_T
 AC_CHECK_SIZEOF(off_t, 0)
 AC_MSG_TRY_LINK(for long long, ftp_cv_HAVE_LONG_LONG, [
-#include <sys/types.h>] , [
-long long X = 2, Y = 1, Z;
-Z = X / Y; ], [
-AC_DEFINE(HAVE_LONG_LONG, 1)
-have_long_long=yes], [have_long_long=no])
+#include <sys/types.h>
+    ] , [
+	long long X = 2, Y = 1, Z;
+	Z = X / Y;
+    ], [
+	AC_DEFINE(HAVE_LONG_LONG, 1)
+	have_long_long=yes
+    ], [have_long_long=no])
 
 AC_MSG_TRY_COMPILE(for in_port_t, ftp_cv_HAVE_IN_PORT_T, [
 #include <sys/types.h>
-#include <netinet/in.h> ], [ in_port_t X ], [AC_DEFINE(HAVE_IN_PORT_T, 1)])
+#include <netinet/in.h>
+    ], [ in_port_t X ], [AC_DEFINE(HAVE_IN_PORT_T, 1)])
 
 AC_MSG_TRY_COMPILE(for sa_family_t, ftp_cv_HAVE_SA_FAMILY_T, [
 #include <sys/types.h>
-#include <sys/socket.h> ], [ sa_family_t X ], [AC_DEFINE(HAVE_SA_FAMILY_T, 1)])
+#include <sys/socket.h>
+    ], [ sa_family_t X ], [AC_DEFINE(HAVE_SA_FAMILY_T, 1)])
 
 AC_MSG_TRY_COMPILE(for sockaddr_in.sin_len, ftp_cv_HAVE_SOCKADDR_SA_LEN, [
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <netinet/in.h> ], [
+#include <netinet/in.h>
+    ], [
 	struct sockaddr_in sin;
-	int X = sin.sin_len ], [AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1)])
+	int X = sin.sin_len
+    ], [AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1)])
 
 AC_MSG_TRY_COMPILE(for socklen_t, ftp_cv_HAVE_SOCKLEN_T, [
 #include <sys/types.h>
-#include <sys/socket.h> ], [ socklen_t X ], [AC_DEFINE(HAVE_SOCKLEN_T, 1)])
+#include <sys/socket.h>
+    ], [ socklen_t X ], [AC_DEFINE(HAVE_SOCKLEN_T, 1)])
 
 if test $opt_ipv6 = yes; then
 
 	AC_MSG_TRY_COMPILE(for AF_INET6, ftp_cv_HAVE_AF_INET6, [
 #include <sys/types.h>
-#include <sys/socket.h> ],
-	    [ int X = AF_INET6 ], [AC_DEFINE(HAVE_AF_INET6, 1)])
+#include <sys/socket.h>
+	    ], [ int X = AF_INET6 ], [AC_DEFINE(HAVE_AF_INET6, 1)])
 
 	AC_MSG_TRY_COMPILE(for struct sockaddr_in6, ftp_cv_HAVE_SOCKADDR_IN6, [
 #include <sys/types.h>
-#include <netinet/in.h> ], [
-	    struct sockaddr_in6 X;
-	    int Y = X.sin6_scope_id ], [AC_DEFINE(HAVE_SOCKADDR_IN6, 1)])
+#include <netinet/in.h>
+	    ], [
+	struct sockaddr_in6 X;
+	int Y = X.sin6_scope_id
+	    ], [AC_DEFINE(HAVE_SOCKADDR_IN6, 1)])
 
 	if test $ac_cv_header_arpa_nameser_h = yes; then
 		AC_MSG_TRY_COMPILE(for IN6ADDRSZ in arpa/nameser.h,
-				    ftp_cv_HAVE_IN6ADDRSZ,
-		[ #include <arpa/nameser.h> ],
-		[ int X = IN6ADDRSZ ], [AC_DEFINE(HAVE_IN6ADDRSZ, 1)])
+				    ftp_cv_HAVE_IN6ADDRSZ, [ 
+#include <sys/types.h>
+#include <arpa/nameser.h>
+		    ], [ int X = IN6ADDRSZ ], [AC_DEFINE(HAVE_IN6ADDRSZ, 1)])
 	fi
 
 fi
@@ -120,8 +131,8 @@ fi
 AC_MSG_TRY_COMPILE(for struct addrinfo, ftp_cv_HAVE_ADDRINFO, [
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <netdb.h> ],
-	    [ struct addrinfo X ], [AC_DEFINE(HAVE_ADDRINFO, 1)])
+#include <netdb.h>
+    ], [ struct addrinfo X ], [AC_DEFINE(HAVE_ADDRINFO, 1)])
 
 AC_MSG_TRY_COMPILE(for d_namlen in struct dirent, ftp_cv_HAVE_D_NAMLEN, [
 #if HAVE_DIRENT_H
@@ -137,31 +148,38 @@ AC_MSG_TRY_COMPILE(for d_namlen in struct dirent, ftp_cv_HAVE_D_NAMLEN, [
 # if HAVE_NDIR_H
 #  include <ndir.h>
 # endif
-#endif ], [
+#endif
+    ], [
 	struct dirent dp;
-	int X = dp.d_namlen; ], [AC_DEFINE(HAVE_D_NAMLEN, 1)])
+	int X = dp.d_namlen;
+    ], [AC_DEFINE(HAVE_D_NAMLEN, 1)])
 
 AC_MSG_TRY_COMPILE(for h_errno declaration, ftp_cv_HAVE_H_ERRNO_D, [
-#include <netdb.h> ], [ int X = h_errno ], [AC_DEFINE(HAVE_H_ERRNO_D, 1)])
+#include <netdb.h>
+    ], [ int X = h_errno ], [AC_DEFINE(HAVE_H_ERRNO_D, 1)])
 
 AC_MSG_TRY_COMPILE(for fclose() declaration, ftp_cv_HAVE_FCLOSE_D, [
-#include <stdio.h> ], [ int (*X)() = fclose ], [AC_DEFINE(HAVE_FCLOSE_D, 1)])
+#include <stdio.h>
+    ], [ int (*X)() = fclose ], [AC_DEFINE(HAVE_FCLOSE_D, 1)])
 
 AC_MSG_TRY_COMPILE(for getpass() declaration, ftp_cv_HAVE_GETPASS_D, [
 #include <stdlib.h>
-#include <unistd.h> ], [ char *(*X)() = getpass ], [
-	AC_DEFINE(HAVE_GETPASS_D, 1)])
+#include <unistd.h>
+    ], [ char *(*X)() = getpass ], [ AC_DEFINE(HAVE_GETPASS_D, 1)])
 
 AC_MSG_TRY_COMPILE(for optarg declaration, ftp_cv_HAVE_OPTARG_D, [
 #include <stdlib.h>
-#include <unistd.h> ], [ char *X = optarg ], [AC_DEFINE(HAVE_OPTARG_D, 1)])
+#include <unistd.h>
+    ], [ char *X = optarg ], [AC_DEFINE(HAVE_OPTARG_D, 1)])
 
 AC_MSG_TRY_COMPILE(for optind declaration, ftp_cv_HAVE_OPTIND_D, [
 #include <stdlib.h>
-#include <unistd.h> ], [ int X = optind ], [AC_DEFINE(HAVE_OPTIND_D, 1)])
+#include <unistd.h>
+    ], [ int X = optind ], [AC_DEFINE(HAVE_OPTIND_D, 1)])
 
 AC_MSG_TRY_COMPILE(for pclose() declaration, ftp_cv_HAVE_PCLOSE_D, [
-#include <stdio.h> ], [ int (*X)() = pclose ], [AC_DEFINE(HAVE_PCLOSE_D, 1)])
+#include <stdio.h>
+    ], [ int (*X)() = pclose ], [AC_DEFINE(HAVE_PCLOSE_D, 1)])
 
 
 dnl Checks for library functions.
@@ -181,8 +199,10 @@ LIBOBJS="$LIBOBJS glob.o"
 
 if test $ac_cv_func_strptime = yes; then
 	AC_MSG_TRY_COMPILE(for strptime() declaration, ftp_cv_HAVE_STRPTIME_D, [
-	#include <time.h> ], [ char *X = strptime("", "", NULL) ],
-	[AC_DEFINE(HAVE_STRPTIME_D, 1)])
+#include <time.h>
+	    ], [
+	char *X = strptime("", "", NULL)
+	    ], [AC_DEFINE(HAVE_STRPTIME_D, 1)])
 fi
 
 if test $have_long_long = yes -a $ac_cv_sizeof_off_t -ge 8; then
@@ -194,12 +214,12 @@ dnl		support because we don't know how to display it.
 	AC_MSG_CHECKING(*printf() support for %lld)
 	can_printf_longlong=no
 	AC_TRY_RUN([
-		#include <stdio.h>
-		int main() {
-			char buf[100];
-			sprintf(buf, "%lld", 4294967300LL);
-			return (strcmp(buf, "4294967300"));
-		}
+#include <stdio.h>
+int main() {
+	char buf[100];
+	sprintf(buf, "%lld", 4294967300LL);
+	return (strcmp(buf, "4294967300"));
+}
 	], [
 		AC_MSG_RESULT(yes)
 		can_printf_longlong=yes
@@ -210,12 +230,12 @@ dnl		support because we don't know how to display it.
 	if test $can_printf_longlong != yes; then
 		AC_MSG_CHECKING(*printf() support for %qd)
 		AC_TRY_RUN([
-			#include <stdio.h>
-			int main() {
-				char buf[100];
-				sprintf(buf, "%qd", 4294967300LL);
-				return (strcmp(buf, "4294967300"));
-			}
+#include <stdio.h>
+int main() {
+	char buf[100];
+	sprintf(buf, "%qd", 4294967300LL);
+	return (strcmp(buf, "4294967300"));
+}
 		], [
 			AC_MSG_RESULT(yes)
 			can_printf_longlong=yes
@@ -236,8 +256,9 @@ fi
 if test $opt_editcomplete = yes; then
 	if test $have_libedit = yes; then
 		AC_MSG_TRY_COMPILE(for EL_RPROMPT in libedit,
-				    ftp_cv_have_libedit, [
-		#include <histedit.h> ], [ int X = EL_RPROMPT ], [:],
+		    ftp_cv_have_libedit, [
+#include <histedit.h>
+		    ], [ int X = EL_RPROMPT ], [:],
 		have_libedit=no )
 	fi
 
@@ -258,8 +279,10 @@ fi
 
 if test $ac_cv_func_sl_init = yes; then
 	AC_MSG_TRY_COMPILE(if sl_add() returns int, ftp_cv_INT_SL_ADD, [
-	#include <stringlist.h> ], [ int f = sl_add((StringList *)0, "foo") ],
-	[:] , [LIBOBJS="$LIBOBJS sl_init.o"])
+#include <stringlist.h>
+	    ], [
+	int f = sl_add((StringList *)0, "foo")
+	    ], [:] , [LIBOBJS="$LIBOBJS sl_init.o"])
 fi
 
 
@@ -267,10 +290,10 @@ have_rfc2553_netdb=no
 if test $ac_cv_func_getaddrinfo = yes -a ! -n "$socks"; then
 	AC_MSG_TRY_COMPILE(for AI_NUMERICHOST,
 	    ftp_cv_have_ai_numerichost, [
-	#include <sys/types.h>
-	#include <sys/socket.h>
-	#include <netdb.h> ],
-	    [ int X = AI_NUMERICHOST ], [ have_rfc2553_netdb=yes ])
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+	    ], [ int X = AI_NUMERICHOST ], [ have_rfc2553_netdb=yes ])
 fi
 AC_MSG_CHECKING(for working getaddrinfo())
 if test $have_rfc2553_netdb = yes; then
@@ -288,10 +311,10 @@ fi
 
 if test $ac_cv_header_vis_h = yes; then
 	AC_MSG_TRY_COMPILE(for VIS_WHITE in vis.h,
-			    ftp_cv_have_vis_white, [
-	#include <sys/types.h>
-	#include <vis.h> ], [ int X = VIS_WHITE ], [:],
-	ac_cv_header_vis_h=no )
+	    ftp_cv_have_vis_white, [
+#include <sys/types.h>
+#include <vis.h>
+	    ], [ int X = VIS_WHITE ], [:], ac_cv_header_vis_h=no )
 fi