head	1.2;
access;
symbols
	RELENG_8_4:1.2.0.2
	RELENG_8_3_0_RELEASE:1.1.1.2
	RELENG_8_3:1.1.1.2.0.44
	RELENG_8_3_BP:1.1.1.2
	RELENG_7_4_0_RELEASE:1.1.1.2
	RELENG_8_2_0_RELEASE:1.1.1.2
	RELENG_7_4:1.1.1.2.0.42
	RELENG_7_4_BP:1.1.1.2
	RELENG_8_2:1.1.1.2.0.40
	RELENG_8_2_BP:1.1.1.2
	RELENG_8_1_0_RELEASE:1.1.1.2
	RELENG_8_1:1.1.1.2.0.38
	RELENG_8_1_BP:1.1.1.2
	RELENG_7_3_0_RELEASE:1.1.1.2
	RELENG_7_3:1.1.1.2.0.36
	RELENG_7_3_BP:1.1.1.2
	RELENG_8_0_0_RELEASE:1.1.1.2
	RELENG_8_0:1.1.1.2.0.34
	RELENG_8_0_BP:1.1.1.2
	RELENG_8:1.1.1.2.0.32
	RELENG_8_BP:1.1.1.2
	RELENG_7_2_0_RELEASE:1.1.1.2
	RELENG_7_2:1.1.1.2.0.30
	RELENG_7_2_BP:1.1.1.2
	RELENG_7_1_0_RELEASE:1.1.1.2
	RELENG_6_4_0_RELEASE:1.1.1.2
	RELENG_7_1:1.1.1.2.0.28
	RELENG_7_1_BP:1.1.1.2
	RELENG_6_4:1.1.1.2.0.26
	RELENG_6_4_BP:1.1.1.2
	RELENG_7_0_0_RELEASE:1.1.1.2
	RELENG_6_3_0_RELEASE:1.1.1.2
	RELENG_7_0:1.1.1.2.0.24
	RELENG_7_0_BP:1.1.1.2
	RELENG_6_3:1.1.1.2.0.22
	RELENG_6_3_BP:1.1.1.2
	RELENG_7:1.1.1.2.0.20
	RELENG_7_BP:1.1.1.2
	RELENG_6_2_0_RELEASE:1.1.1.2
	RELENG_6_2:1.1.1.2.0.18
	RELENG_6_2_BP:1.1.1.2
	RELENG_5_5_0_RELEASE:1.1.1.2
	RELENG_5_5:1.1.1.2.0.16
	RELENG_5_5_BP:1.1.1.2
	RELENG_6_1_0_RELEASE:1.1.1.2
	RELENG_6_1:1.1.1.2.0.14
	RELENG_6_1_BP:1.1.1.2
	RELENG_6_0_0_RELEASE:1.1.1.2
	RELENG_6_0:1.1.1.2.0.12
	RELENG_6_0_BP:1.1.1.2
	RELENG_6:1.1.1.2.0.10
	RELENG_6_BP:1.1.1.2
	nbsd_20050516:1.1.1.2
	RELENG_5_4_0_RELEASE:1.1.1.2
	RELENG_5_4:1.1.1.2.0.8
	RELENG_5_4_BP:1.1.1.2
	nbsd_20050219:1.1.1.2
	RELENG_5_3_0_RELEASE:1.1.1.2
	RELENG_5_3:1.1.1.2.0.6
	RELENG_5_3_BP:1.1.1.2
	RELENG_5:1.1.1.2.0.4
	RELENG_5_BP:1.1.1.2
	RELENG_5_2_1_RELEASE:1.1.1.2
	RELENG_5_2_0_RELEASE:1.1.1.2
	RELENG_5_2:1.1.1.2.0.2
	RELENG_5_2_BP:1.1.1.2
	nbsd_20031103:1.1.1.2
	nbsd_20030630:1.1.1.2
	nbsd_20030615:1.1.1.1
	LUKEM:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2011.06.20.08.00.32;	author gavin;	state dead;
branches
	1.2.2.1;
next	1.1;

1.1
date	2003.06.16.02.36.37;	author mikeh;	state Exp;
branches
	1.1.1.1;
next	;

1.2.2.1
date	2011.06.20.08.00.32;	author svnexp;	state dead;
branches;
next	1.2.2.2;

1.2.2.2
date	2013.03.28.13.01.39;	author svnexp;	state Exp;
branches;
next	;

1.1.1.1
date	2003.06.16.02.36.37;	author mikeh;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2003.06.30.05.24.20;	author mikeh;	state Exp;
branches;
next	;


desc
@@


1.2
log
@SVN rev 223328 on 2011-06-20 08:00:32Z by gavin

Merge tnftp-20100108 from the vendor branch into head.

PR:		bin/112288 bin/120256 bin/129014 bin/145528
MFC after:	1 month
@
text
@diff -ru src.orig/cmds.c src/cmds.c
--- src.orig/cmds.c	Sun Jun 15 22:11:43 2003
+++ src/cmds.c	Sun Jun 15 21:46:37 2003
@@@@ -131,6 +131,7 @@@@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
+#include <libutil.h>
 
 #include "ftp_var.h"
 #include "version.h"
diff -ru src.orig/fetch.c src/fetch.c
--- src.orig/fetch.c	Sun Jun 15 22:11:43 2003
+++ src/fetch.c	Sun Jun 15 21:46:53 2003
@@@@ -69,6 +69,7 @@@@
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
+#include <libutil.h>
 
 #include "ftp_var.h"
 #include "version.h"
Only in src: ftp.cat1
diff -ru src.orig/progressbar.c src/progressbar.c
--- src.orig/progressbar.c	Sun Jun 15 22:11:43 2003
+++ src/progressbar.c	Sun Jun 15 21:50:48 2003
@@@@ -50,6 +50,7 @@@@
  */
 #include <sys/types.h>
 #include <sys/param.h>
+#include <sys/time.h>
 
 #include <err.h>
 #include <errno.h>
@@@@ -57,10 +58,12 @@@@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <tzfile.h>
 #include <unistd.h>
 
 #include "progressbar.h"
+
+#define SECSPERHOUR	60
+#define SECSPERDAY	((long)60 * 60 * 24)
 
 #if !defined(NO_PROGRESS)
 /*
diff -ru src.orig/util.c src/util.c
--- src.orig/util.c	Sun Jun 15 22:11:44 2003
+++ src/util.c	Sun Jun 15 21:51:31 2003
@@@@ -101,10 +101,11 @@@@
 #include <string.h>
 #include <termios.h>
 #include <time.h>
-#include <tzfile.h>
 #include <unistd.h>
 
 #include "ftp_var.h"
+
+#define TM_YEAR_BASE	1900
 
 /*
  * Connect to peer server and auto-login, if possible.
@


1.2.2.1
log
@file FreeBSD-patchset was added on branch RELENG_8_4 on 2013-03-28 13:01:39 +0000
@
text
@d1 64
@


1.2.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 64
diff -ru src.orig/cmds.c src/cmds.c
--- src.orig/cmds.c	Sun Jun 15 22:11:43 2003
+++ src/cmds.c	Sun Jun 15 21:46:37 2003
@@@@ -131,6 +131,7 @@@@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
+#include <libutil.h>
 
 #include "ftp_var.h"
 #include "version.h"
diff -ru src.orig/fetch.c src/fetch.c
--- src.orig/fetch.c	Sun Jun 15 22:11:43 2003
+++ src/fetch.c	Sun Jun 15 21:46:53 2003
@@@@ -69,6 +69,7 @@@@
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
+#include <libutil.h>
 
 #include "ftp_var.h"
 #include "version.h"
Only in src: ftp.cat1
diff -ru src.orig/progressbar.c src/progressbar.c
--- src.orig/progressbar.c	Sun Jun 15 22:11:43 2003
+++ src/progressbar.c	Sun Jun 15 21:50:48 2003
@@@@ -50,6 +50,7 @@@@
  */
 #include <sys/types.h>
 #include <sys/param.h>
+#include <sys/time.h>
 
 #include <err.h>
 #include <errno.h>
@@@@ -57,10 +58,12 @@@@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <tzfile.h>
 #include <unistd.h>
 
 #include "progressbar.h"
+
+#define SECSPERHOUR	(60 * 60)
+#define SECSPERDAY	((long)60 * 60 * 24)
 
 #if !defined(NO_PROGRESS)
 /*
diff -ru src.orig/util.c src/util.c
--- src.orig/util.c	Sun Jun 15 22:11:44 2003
+++ src/util.c	Sun Jun 15 21:51:31 2003
@@@@ -101,10 +101,11 @@@@
 #include <string.h>
 #include <termios.h>
 #include <time.h>
-#include <tzfile.h>
 #include <unistd.h>
 
 #include "ftp_var.h"
+
+#define TM_YEAR_BASE	1900
 
 /*
  * Connect to peer server and auto-login, if possible.
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Import the June 15, 2003 CVS version of NetBSD's ftp + patchset to fix
header file differences between FBSD and NBSD. Like lukemftpd, the
portable version of lukemftp lags too far behind CVS.

This import includes several big fixes plus a cleaned up manpage.
@
text
@@


1.1.1.2
log
@Import latest cvs version with the correct patchset (fixes ETA bug).
@
text
@d44 1
a44 1
+#define SECSPERHOUR	(60 * 60)
@

