warning fixes and cleanups for 64-bit machines

[citadel.git] / citadel / aidepost.c

diff --git a/citadel/aidepost.c b/citadel/aidepost.c
index 81fbe7784328ba00395118745f36c518d3591777..37d1a295e92e8b1d4844bd61967d11070a92f646 100644 (file)
--- a/citadel/aidepost.c
+++ b/citadel/aidepost.c
@@ -7,14 +7,30 @@
 #include <stdlib.h>
 #include <unistd.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 <limits.h>
 #include <errno.h>
 #include <string.h>
 #include "citadel.h"
 #include "config.h"
 
-void make_message(FILE *fp, char *target_room, char *author)
+#ifndef HAVE_SNPRINTF
+#include "snprintf.h"
+#endif
+
+
+static void make_message(FILE *fp, char *target_room, char *author)
 {
        int a;
        long bb, cc;
@@ -79,7 +95,8 @@ int main(int argc, char **argv)
        }
 
 
-       snprintf(tempspool, sizeof tempspool, "./network/spoolin/ap.%d",
+       snprintf(tempspool, sizeof tempspool,
+               "./network/spoolin/ap.%04x",
                getpid());
 
        tempfp = tmpfile();
@@ -105,7 +122,5 @@ int main(int argc, char **argv)
        fclose(tempfp);
        fclose(spoolfp);
 
-       execlp("./netproc", "netproc", "-i", NULL);
-       perror("cannot run netproc");
-       exit(errno);
+       exit(0);
 }