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

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 08f4c4f8c4a998fc1373a722890db2972c83116d..919156a6a4da8cf039cca909439df48b3b45809c 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -11,7 +11,18 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <signal.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 <ctype.h>
 #include <string.h>
 #include <errno.h>
@@ -21,7 +32,6 @@
 #include <netdb.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include "citadel.h"
@@ -65,10 +75,10 @@ void master_startup(void) {
        check_ref_counts();
 
        lprintf(7, "Creating base rooms (if necessary)\n");
-       create_room(BASEROOM,           0, "", 0);
-       create_room(AIDEROOM,           3, "", 0);
-       create_room(SYSCONFIGROOM,      3, "", 0);
-       create_room(config.c_twitroom,  0, "", 0);
+       create_room(BASEROOM,           0, "", 0, 1);
+       create_room(AIDEROOM,           3, "", 0, 1);
+       create_room(SYSCONFIGROOM,      3, "", 0, 1);
+       create_room(config.c_twitroom,  0, "", 0, 1);
 
        lprintf(7, "Seeding the pseudo-random number generator...\n");
        gettimeofday(&tv, NULL);
@@ -1191,6 +1201,10 @@ void do_command_loop(void) {
                cmd_conf(&cmdbuf[5]);
                }
 
+       else if (!strncasecmp(cmdbuf, "SEEN", 4)) {
+               cmd_seen(&cmdbuf[5]);
+               }
+
 #ifdef DEBUG_MEMORY_LEAKS
        else if (!strncasecmp(cmdbuf, "LEAK", 4)) {
                dump_tracked();