diff options
author | gavin <gavin@FreeBSD.org> | 2011-06-20 08:00:32 +0000 |
---|---|---|
committer | gavin <gavin@FreeBSD.org> | 2011-06-20 08:00:32 +0000 |
commit | 53f276e3d4f7f36bd258c609d0908855d1a26243 (patch) | |
tree | f11cc58f8cc459a6d42d318bd66f3e5a209e87ba /contrib/tnftp/FreeBSD-patchset | |
parent | 9185689916b66441c4139d598975c6e6a773b5bc (diff) | |
parent | eff741aef035a9d542d756973d0a81dd4ad6bbe6 (diff) | |
download | FreeBSD-src-53f276e3d4f7f36bd258c609d0908855d1a26243.zip FreeBSD-src-53f276e3d4f7f36bd258c609d0908855d1a26243.tar.gz |
Merge tnftp-20100108 from the vendor branch into head.
PR: bin/112288 bin/120256 bin/129014 bin/145528
MFC after: 1 month
Diffstat (limited to 'contrib/tnftp/FreeBSD-patchset')
-rw-r--r-- | contrib/tnftp/FreeBSD-patchset | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/contrib/tnftp/FreeBSD-patchset b/contrib/tnftp/FreeBSD-patchset deleted file mode 100644 index 2f9ff8a..0000000 --- a/contrib/tnftp/FreeBSD-patchset +++ /dev/null @@ -1,64 +0,0 @@ -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. |