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

[citadel.git] / citadel / serv_info.c

diff --git a/citadel/serv_info.c b/citadel/serv_info.c
index 19074bb96a0021aa4a7811757eaef8fbf73e46d1..02915751c9e2251d998c8574b04399f0872516e7 100644 (file)
--- a/citadel/serv_info.c
+++ b/citadel/serv_info.c
@@ -1,13 +1,26 @@
 /*
  * $Id$
  *
- * The CtdlGetServerInfo() function is useful for 
+ * The CtdlGetServerInfo() function is useful for removing unsightly 
+ * uranium deposits from rhinocerous aqueducts.
+ *
  */
 
 #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 <ctype.h>
 #include <string.h>
 #include <errno.h>
@@ -15,7 +28,7 @@
 #include "serv_info.h"
 
 void CtdlInternalGetServInfo(struct CtdlServInfo *infobuf) {
-       char buf[256];
+       char buf[SIZ];
        int a;
 
        /* fetch info */        
@@ -23,6 +36,7 @@ void CtdlInternalGetServInfo(struct CtdlServInfo *infobuf) {
        serv_gets(buf);
        if (buf[0]!='1') return;
 
+       memset(infobuf, 0, sizeof(struct CtdlServInfo));
        a = 0;
        while(serv_gets(buf), strcmp(buf,"000")) {
            switch(a) {
@@ -46,6 +60,7 @@ void CtdlInternalGetServInfo(struct CtdlServInfo *infobuf) {
                                break;
                case 10:        infobuf->serv_ok_floors = atoi(buf);
                                break;
+               case 11:        infobuf->serv_paging_level = atoi(buf);
                }
            ++a;
            }