fix all the <time.h> vs. <sys/time.h> issues, hopefully

[citadel.git] / citadel / readlog.c

diff --git a/citadel/readlog.c b/citadel/readlog.c
index 96e78d7c8f1a65a3970d737c35624d4b4c29408a..b11dbf46c902f0b3f3bfe38509b5e01b9bb4fb0e 100644 (file)
--- a/citadel/readlog.c
+++ b/citadel/readlog.c
@@ -1,30 +1,40 @@
 /* 
- * readlog.c
- * v1.5
+ * $Id$
+ *
+ * A simple program to parse citadel.log
  */
 
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <time.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
+#endif
+
 #include <string.h>
 #include <errno.h>
 #include "citadel.h"
 
-void get_config ();
+void get_config (void);
 struct config config;
 
-void 
-main (argc, argv)
-     int argc;
-     char *argv[];
+int 
+main (int argc, char **argv)
 {
   time_t LogTime;
   unsigned int LogType;
-  char LogName[256];
+  char LogName[SIZ];
 
-  char buf[256];
+  char buf[SIZ];
   char aaa[100];
   struct tm *tm;
   char *tstring;
@@ -40,16 +50,14 @@ main (argc, argv)
     }
   else
     {
-      while (fgets (buf, 256, logfp) != NULL)
+      while (fgets (buf, sizeof buf, logfp) != NULL)
        {
          buf[strlen (buf) - 1] = 0;
+         strcat(buf, " ");
 
-         LogTime = atol (buf);
-         strcpy (buf, index (buf, '|'));
-         LogType = atoi (buf);
-         strcpy (buf, index (buf, '|'));
-         strcpy (LogName, buf);
-
+         LogTime = atol (strtok(buf, "|"));
+          LogType = atol (strtok(NULL, "|"));
+          strcpy(LogName, strtok(NULL, "|"));
 
          if (LogType != 0)
            {