head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


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

1.1
date	2011.06.19.21.50.38;	author gavin;	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 * 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
@SVN rev 223308 on 2011-06-19 21:50:38Z by gavin

Copy lukemftp to its new home, tnftp.  I'm doing this in stages so as to
not confuse the CVS exporter.
@
text
@@

