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

[citadel.git] / citadel / aidepost.c

diff --git a/citadel/aidepost.c b/citadel/aidepost.c
index cd5599a715ed1373306edf347c66af44f30727dc..0ed777b66f457ef428de76c2a86f84248f69eca7 100644 (file)
--- a/citadel/aidepost.c
+++ b/citadel/aidepost.c
@@ -1,19 +1,31 @@
-/* aidepost.c
- * This is just a little hack to copy standard input to a message in Aide>
- * v2.0
+/*
  * $Id$
+ *
+ * This is just a little hack to copy standard input to a message in Aide>
  */
 
 #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)
+void make_message(FILE *fp, char *target_room, char *author)
 {
        int a;
        long bb, cc;
@@ -26,9 +38,9 @@ void make_message(FILE *fp)
        putc(0, fp);
        fprintf(fp, "T%ld", (long)now);
        putc(0, fp);
-       fprintf(fp, "ACitadel");
+       fprintf(fp, "A%s", author);
        putc(0, fp);
-       fprintf(fp, "OAide");
+       fprintf(fp, "O%s", target_room);
        putc(0, fp);
        fprintf(fp, "N%s", NODENAME);
        putc(0, fp);
@@ -50,28 +62,45 @@ void make_message(FILE *fp)
 
 int main(int argc, char **argv)
 {
-       char tempbase[32];
-       char temptmp[64];
        char tempspool[64];
+       char target_room[ROOMNAMELEN];
+       char author[64];
        FILE *tempfp, *spoolfp;
        int ch;
+       int i;
 
        get_config();
-       snprintf(tempbase, sizeof tempbase, "ap.%d", getpid());
-       snprintf(temptmp, sizeof temptmp, "/tmp/%s", tempbase);
-       snprintf(tempspool, sizeof tempspool, "./network/spoolin/%s", tempbase);
 
-       tempfp = fopen(temptmp, "wb+");
+       strcpy(target_room, "Aide");
+       strcpy(author, "Citadel");
+       for (i=1; i<argc; ++i) {
+               if (!strncasecmp(argv[i], "-r", 2)) {
+                       strncpy(target_room, &argv[i][2], sizeof(target_room));
+                       target_room[sizeof(target_room)-1] = 0;
+               }
+               else if (!strncasecmp(argv[i], "-a", 2)) {
+                       strncpy(author, &argv[i][2], sizeof(author));
+                       author[sizeof(author)-1] = 0;
+               } else {
+                       fprintf(stderr, "%s: usage: %s "
+                                       "[-rTargetRoom] [-aAuthor]\n",
+                               argv[0], argv[0]);
+                       exit(1);
+               }
+       }
+
+
+       snprintf(tempspool, sizeof tempspool, "./network/spoolin/ap.%d",
+               getpid());
+
+       tempfp = tmpfile();
        if (tempfp == NULL) {
                perror("cannot open temp file");
                exit(errno);
        }
-       /* Unlink the temp file, so it automatically gets deleted by the OS if
-        * this program is interrupted or crashes.
-        */ unlink(temptmp);
 
        /* Generate a message from stdin */
-       make_message(tempfp);
+       make_message(tempfp, target_room, author);
 
        /* Copy it to a new temp file in the spool directory */
        rewind(tempfp);