Module Name: othersrc
Committed By: christos
Date: Wed Mar 6 22:58:31 UTC 2013
Modified Files:
othersrc/libexec/tnftpd/src: cmds.c extern.h ftpd.c
Log Message:
merge tzfile.h in one place, and deal with not having it.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 othersrc/libexec/tnftpd/src/cmds.c \
othersrc/libexec/tnftpd/src/extern.h
cvs rdiff -u -r1.31 -r1.32 othersrc/libexec/tnftpd/src/ftpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/libexec/tnftpd/src/cmds.c
diff -u othersrc/libexec/tnftpd/src/cmds.c:1.13 othersrc/libexec/tnftpd/src/cmds.c:1.14
--- othersrc/libexec/tnftpd/src/cmds.c:1.13 Fri Nov 6 22:26:21 2009
+++ othersrc/libexec/tnftpd/src/cmds.c Wed Mar 6 17:58:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cmds.c,v 1.13 2009/11/07 03:26:21 lukem Exp $ */
+/* $NetBSD: cmds.c,v 1.14 2013/03/06 22:58:31 christos Exp $ */
/* from NetBSD: cmds.c,v 1.30 2009/03/15 07:48:36 lukem Exp */
/*
@@ -108,7 +108,6 @@ __RCSID(" NetBSD: cmds.c,v 1.30 2009/03/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <tzfile.h>
#include <unistd.h>
#include <ctype.h>
Index: othersrc/libexec/tnftpd/src/extern.h
diff -u othersrc/libexec/tnftpd/src/extern.h:1.13 othersrc/libexec/tnftpd/src/extern.h:1.14
--- othersrc/libexec/tnftpd/src/extern.h:1.13 Fri Nov 6 22:26:21 2009
+++ othersrc/libexec/tnftpd/src/extern.h Wed Mar 6 17:58:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.13 2009/11/07 03:26:21 lukem Exp $ */
+/* $NetBSD: extern.h,v 1.14 2013/03/06 22:58:31 christos Exp $ */
/* from NetBSD: extern.h,v 1.61 2009/07/13 19:05:40 roy Exp */
/*-
@@ -203,6 +203,13 @@ int ftpd_logoutx(const char *, int, int)
# define HAVE_SETPROCTITLE 1
# define HAVE_STRUCT_SOCKADDR_SA_LEN 1
# define HAVE_SOCKADDR_SNPRINTF 1
+# define HAVE_TZFILE_H 1
+#endif
+
+#ifdef HAVE_TZFILE_H
+#include <tzfile.h>
+#else
+#define TM_BASE_YEAR 1900
#endif
struct sockinet {
Index: othersrc/libexec/tnftpd/src/ftpd.c
diff -u othersrc/libexec/tnftpd/src/ftpd.c:1.31 othersrc/libexec/tnftpd/src/ftpd.c:1.32
--- othersrc/libexec/tnftpd/src/ftpd.c:1.31 Fri Nov 6 22:26:21 2009
+++ othersrc/libexec/tnftpd/src/ftpd.c Wed Mar 6 17:58:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ftpd.c,v 1.31 2009/11/07 03:26:21 lukem Exp $ */
+/* $NetBSD: ftpd.c,v 1.32 2013/03/06 22:58:31 christos Exp $ */
/* from NetBSD: ftpd.c,v 1.194 2009/07/13 19:05:40 roy Exp */
/*
@@ -151,7 +151,6 @@ __RCSID(" NetBSD: ftpd.c,v 1.194 2009/07
#include <string.h>
#include <syslog.h>
#include <time.h>
-#include <tzfile.h>
#include <unistd.h>
#include <util.h>
#ifdef SUPPORT_UTMP
