Update to tnftp 20070806.

Notable changes:
 - Implement '-s srcaddr' to set the local IP address for all connections.
 - Support '-q quittime' when waiting for server replies.
 - Use IEC 60027-2 "KiB", "MiB" (etc) instead of "KB", "MB", ...
 - Portability fixes, including for FreeBSD, Mac OS X, and Solaris.

2 files changed, 17 insertions, 14 deletions

diff --git a/net/tnftp/files/libnetbsd/fgetln.c b/net/tnftp/files/libnetbsd/fgetln.c
index 25bfe98391c..72ae50c45ce 100644
--- a/net/tnftp/files/libnetbsd/fgetln.c
+++ b/net/tnftp/files/libnetbsd/fgetln.c
@@ -1,4 +1,4 @@
-/*	NetBSD: fgetln.c,v 1.2 2003/02/28 10:44:46 lukem Exp	*/
+/*	$NetBSD: fgetln.c,v 1.1.1.3 2007/07/22 11:36:31 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -15,11 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
+ * 3. Neither the name of The NetBSD Foundation nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
  *
@@ -56,8 +52,8 @@ fgetln(fp, len)
 
 	if (fgets(buf, bufsiz, fp) == NULL)
 		return NULL;
-	*len = 0;
 
+	*len = 0;
 	while ((ptr = strchr(&buf[*len], '\n')) == NULL) {
 		size_t nbufsiz = bufsiz + BUFSIZ;
 		char *nbuf = realloc(buf, nbufsiz);
diff --git a/net/tnftp/files/libnetbsd/ftpglob.h b/net/tnftp/files/libnetbsd/ftpglob.h
index 044dad5c22f..d1402efb269 100644
--- a/net/tnftp/files/libnetbsd/ftpglob.h
+++ b/net/tnftp/files/libnetbsd/ftpglob.h
@@ -1,5 +1,5 @@
-/*	NetBSD: ftpglob.h,v 1.3 2005/05/16 05:45:40 lukem Exp	*/
-/*	from	NetBSD: glob.h,v 1.19 2005/02/03 04:39:32 perry Exp	*/
+/* $NetBSD: ftpglob.h,v 1.1.1.4 2007/07/22 11:41:57 lukem Exp $ */
+/* from NetBSD: glob.h,v 1.21 2006/03/26 18:11:22 christos Exp */
 
 /*
  * Copyright (c) 1989, 1993
@@ -38,10 +38,17 @@
 #ifndef _GLOB_H_
 #define	_GLOB_H_
 
+#ifndef __gl_size_t
+#define __gl_size_t	size_t
+#endif
+#ifndef __gl_stat_t
+#define __gl_stat_t	struct stat
+#endif
+
 typedef struct {
-	int gl_pathc;		/* Count of total paths so far. */
-	int gl_matchc;		/* Count of paths matching pattern. */
-	int gl_offs;		/* Reserved at beginning of gl_pathv. */
+	__gl_size_t gl_pathc;	/* Count of total paths so far. */
+	__gl_size_t gl_matchc;	/* Count of paths matching pattern. */
+	__gl_size_t gl_offs;	/* Reserved at beginning of gl_pathv. */
 	int gl_flags;		/* Copy of flags parameter to glob. */
 	char **gl_pathv;	/* List of paths matching pattern. */
 				/* Copy of errfunc parameter to glob. */
@@ -55,8 +62,8 @@ typedef struct {
 	void (*gl_closedir)(void *);
 	struct dirent *(*gl_readdir)(void *);	
 	void *(*gl_opendir)(const char *);
-	int (*gl_lstat)(const char *, struct stat *);
-	int (*gl_stat)(const char *, struct stat *);
+	int (*gl_lstat)(const char *, __gl_stat_t *);
+	int (*gl_stat)(const char *, __gl_stat_t *);
 } glob_t;
 
 #define	GLOB_APPEND	0x0001	/* Append to output from previous call. */