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

[citadel.git] / citadel / serv_network.c

diff --git a/citadel/serv_network.c b/citadel/serv_network.c
index d5cdc5d7af3a6d87a27382c9f81f8e0adf1144a0..980160f32bdae55f623c8c61ad02dde3bb194d61 100644 (file)
--- a/citadel/serv_network.c
+++ b/citadel/serv_network.c
@@ -16,13 +16,23 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/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 <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
@@ -65,8 +75,7 @@ void cmd_gnet(char *argbuf) {
 void cmd_snet(char *argbuf) {
        char tempfilename[SIZ];
        char filename[SIZ];
-       char cbuf[SIZ];
-       char *ibuf;
+       char buf[SIZ];
        FILE *fp;
 
        if (CtdlAccessCheck(ac_room_aide)) return;
@@ -82,8 +91,8 @@ void cmd_snet(char *argbuf) {
        }
 
        cprintf("%d %s\n", SEND_LISTING, tempfilename);
-       while (client_gets(&ibuf), strcmp(ibuf, "000")) {
-               fprintf(fp, "%s\n", ibuf);
+       while (client_gets(buf), strcmp(buf, "000")) {
+               fprintf(fp, "%s\n", buf);
        }
        fclose(fp);
 
@@ -92,8 +101,8 @@ void cmd_snet(char *argbuf) {
         * different filesystems)
         */
        unlink(filename);
-       snprintf(cbuf, sizeof cbuf, "/bin/mv %s %s", tempfilename, filename);
-       system(cbuf);
+       snprintf(buf, sizeof buf, "/bin/mv %s %s", tempfilename, filename);
+       system(buf);
 }