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

[citadel.git] / citadel / sendcommand.c

diff --git a/citadel/sendcommand.c b/citadel/sendcommand.c
index 811775535b0bc2433ff4ae567a19dad15586e076..8c7f63e5307970636a03d19cb7872891e4c9764c 100644 (file)
--- a/citadel/sendcommand.c
+++ b/citadel/sendcommand.c
@@ -14,7 +14,18 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <ctype.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 <signal.h>
 #include <errno.h>
 #include <limits.h>
@@ -93,8 +104,8 @@ void logoff(int e)
  */
 void np_attach_to_server(void)
 {
-       char hostbuf[256], portbuf[256];
-       char buf[256];
+       char hostbuf[SIZ], portbuf[SIZ];
+       char buf[SIZ];
        char *args[] =
        {"sendcommand", NULL};
 
@@ -119,8 +130,8 @@ void np_attach_to_server(void)
 int main(int argc, char **argv)
 {
        int a;
-       char cmd[256];
-       char buf[256];
+       char cmd[SIZ];
+       char buf[SIZ];
 
        strcpy(bbs_home_directory, BBSDIR);
 
@@ -164,7 +175,7 @@ int main(int argc, char **argv)
                }
        } else if (buf[0] == '4') {
                do {
-                       if (fgets(buf, 255, stdin) == NULL)
+                       if (fgets(buf, sizeof buf, stdin) == NULL)
                                strcpy(buf, "000");
                        if (strlen(buf) > 0)
                                if (buf[strlen(buf) - 1] == '\n')