From 227c92b79dbb6aed6e4e0e045e4f2f63f77a7f2e Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Mon, 27 Jun 2005 22:15:38 +0000
Subject: [PATCH] * Header file adjustments to make it work on FreeBSD

---
 webcit/ChangeLog       |  4 +++-
 webcit/ical_dezonify.c | 28 ++++++++++++++++++++++++++--
 webcit/mime_parser.c   | 27 +++++++++++++++++++++++----
 webcit/notes.c         | 15 ++++++++++++++-
 webcit/setup.c         | 32 ++++++++++++++++++++++++--------
 webcit/tools.c         | 13 +++++++++++--
 webcit/userlist.c      | 12 ++++++------
 webcit/vcard.c         | 37 +++++++++++++++++++++----------------
 8 files changed, 128 insertions(+), 40 deletions(-)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 3eb99b086..86eb8899a 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 619.14  2005/06/27 22:15:38  ajc
+* Header file adjustments to make it work on FreeBSD
+
 Revision 619.13  2005/06/27 17:38:06  ajc
 * HTML pages are now output as "Content-type: text/html; charset=utf-8"
   UTF-8 is going to be the standard character set for the Citadel system.
@@ -2658,4 +2661,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
 	* webserver.c: warning fix
-
diff --git a/webcit/ical_dezonify.c b/webcit/ical_dezonify.c
index 169e0f377..0748bc917 100644
--- a/webcit/ical_dezonify.c
+++ b/webcit/ical_dezonify.c
@@ -11,13 +11,37 @@
  */
 
 
+#include <ctype.h>
+#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#include <stdio.h>
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#include <signal.h>
 #include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/socket.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
-#include <stdio.h>
+#endif
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
 #include <string.h>
-#include <strings.h>
+#include <pwd.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <pthread.h>
+#include <signal.h>
 #include "webcit.h"
+#include "webserver.h"
+
 
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
 
diff --git a/webcit/mime_parser.c b/webcit/mime_parser.c
index 613b9258e..7067bb1a8 100644
--- a/webcit/mime_parser.c
+++ b/webcit/mime_parser.c
@@ -8,18 +8,37 @@
  *
  */
 
-
+#include <ctype.h>
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdio.h>
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
 #include <signal.h>
 #include <sys/types.h>
-#include <ctype.h>
+#include <sys/wait.h>
+#include <sys/socket.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
 #include <string.h>
-#include <sys/stat.h>
+#include <pwd.h>
 #include <errno.h>
-
+#include <stdarg.h>
+#include <pthread.h>
+#include <signal.h>
 #include "webcit.h"
+#include "webserver.h"
+
 #include "mime_parser.h"
 
 
diff --git a/webcit/notes.c b/webcit/notes.c
index c48463228..10dfcff6a 100644
--- a/webcit/notes.c
+++ b/webcit/notes.c
@@ -7,19 +7,32 @@
 
 #include <ctype.h>
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdio.h>
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
 #include <string.h>
 #include <pwd.h>
 #include <errno.h>
 #include <stdarg.h>
-#include <time.h>
+#include <pthread.h>
+#include <signal.h>
 #include "webcit.h"
 #include "webserver.h"
 
diff --git a/webcit/setup.c b/webcit/setup.c
index a43aecda9..f39201112 100644
--- a/webcit/setup.c
+++ b/webcit/setup.c
@@ -7,23 +7,39 @@
  *
  */
 
+
+#include <ctype.h>
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdio.h>
-#include <string.h>
-#include <ctype.h>
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#include <signal.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/utsname.h>
 #include <sys/wait.h>
-#include <signal.h>
-#include <netdb.h>
-#include <errno.h>
+#include <sys/socket.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <string.h>
 #include <pwd.h>
-
+#include <errno.h>
+#include <stdarg.h>
+#include <pthread.h>
+#include <signal.h>
+#include <sys/utsname.h>
 #include "webcit.h"
+#include "webserver.h"
+
 
 #ifdef HAVE_NEWT
 #include <newt.h>
diff --git a/webcit/tools.c b/webcit/tools.c
index d85e47ed7..86fd68ec1 100644
--- a/webcit/tools.c
+++ b/webcit/tools.c
@@ -6,16 +6,25 @@
 
 #include <ctype.h>
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdio.h>
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <netdb.h>
 #include <string.h>
 #include <pwd.h>
@@ -23,10 +32,10 @@
 #include <stdarg.h>
 #include <pthread.h>
 #include <signal.h>
-#include <sys/time.h>
 #include "webcit.h"
 #include "webserver.h"
 
+
 typedef unsigned char byte;
 
 #define FALSE 0
@@ -479,7 +488,7 @@ void generate_uuid(char *buf) {
 
 	sprintf(buf, "%s-%lx-%x-%x",
 		serv_info.serv_nodename,
-		time(NULL),
+		(long)time(NULL),
 		getpid(),
 		(seq++)
 	);
diff --git a/webcit/userlist.c b/webcit/userlist.c
index 6ed4be0c9..176a175eb 100644
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -38,8 +38,8 @@ void userlist(void)
 {
 	char buf[SIZ];
 	char fl[SIZ];
-	struct tm *tmbuf;
-	long lc;
+	struct tm tmbuf;
+	time_t lc;
 	struct namelist *bio = NULL;
 	struct namelist *bptr;
 	int has_bio;
@@ -100,11 +100,11 @@ void userlist(void)
 			extract_long(buf, 2),
 			extract_int(buf, 1));
 		lc = extract_long(buf, 3);
-		tmbuf = (struct tm *) localtime(&lc);
+		localtime_r(&lc, &tmbuf);
 		wprintf("%02d/%02d/%04d ",
-			(tmbuf->tm_mon + 1),
-			tmbuf->tm_mday,
-			(tmbuf->tm_year + 1900));
+			(tmbuf.tm_mon + 1),
+			tmbuf.tm_mday,
+			(tmbuf.tm_year + 1900));
 
 
 		wprintf("</TD><TD>%ld</TD><TD>%5ld</TD></TR>\n",
diff --git a/webcit/vcard.c b/webcit/vcard.c
index bbe0485bd..2198486a3 100644
--- a/webcit/vcard.c
+++ b/webcit/vcard.c
@@ -8,31 +8,36 @@
  * Public License.  All other rights reserved.
  */
 
-
+#include <ctype.h>
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdio.h>
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 #include <signal.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/socket.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
 #endif
-
-#include <ctype.h>
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
 #include <string.h>
+#include <pwd.h>
 #include <errno.h>
-#include <limits.h>
-#include <syslog.h>
-
+#include <stdarg.h>
+#include <pthread.h>
+#include <signal.h>
 #include "webcit.h"
+#include "webserver.h"
 #include "vcard.h"
 
 /* 
-- 
2.30.2