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

[citadel.git] / citadel / tools.c

diff --git a/citadel/tools.c b/citadel/tools.c
index edf78219592a94da780b1f8c19eb482a327f8d75..3260e87d0de639197fa31925dada7c370c90372b 100644 (file)
--- a/citadel/tools.c
+++ b/citadel/tools.c
@@ -10,7 +10,18 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.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 "tools.h"
 #include "citadel.h"
 
@@ -420,3 +431,32 @@ int is_msg_in_mset(char *mset, long msgnum) {
 
        return(0);
 }
+
+
+/*
+ * Utility function to "readline" from memory
+ * (returns new pointer)
+ */
+char *memreadline(char *start, char *buf, int maxlen)
+{
+        char ch;
+        char *ptr;
+        int len = 0;    /* tally our own length to avoid strlen() delays */
+
+        ptr = start;
+        memset(buf, 0, maxlen);
+
+        while (1) {
+                ch = *ptr++;
+                if ( (len < (maxlen - 1)) && (ch != 13) && (ch != 10) ) {
+                        buf[strlen(buf) + 1] = 0;
+                        buf[strlen(buf)] = ch;
+                        ++len;
+                }
+                if ((ch == 10) || (ch == 0)) {
+                        return ptr;
+                }
+        }
+}
+
+