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 b2a88d927400e1a13524c0889cca7e2e6e31f81e..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"
 
@@ -75,10 +86,6 @@ void extract_token(char *dest, char *source, int parmnum, char separator)
        int len;
        int curr_parm;
 
-    /* Stu. Fixed this to deal with the possibility that somebody's
-       going to send a token bigger than SIZ, which is possible 
-       with a bigger input buffer. */
-
        strcpy(dest,"");
        len = 0;
        curr_parm = 0;
@@ -92,10 +99,8 @@ void extract_token(char *dest, char *source, int parmnum, char separator)
                        ++curr_parm;
                }
                else if (curr_parm == parmnum) {
-                   if (len < SIZ) { /* stu 2/8/2001 */
-                               dest[len+1] = 0;
-                               dest[len++] = source[i];
-                       }
+                       dest[len+1] = 0;
+                       dest[len++] = source[i];
                }
        }
 }
@@ -391,6 +396,67 @@ void fmt_date(char *buf, time_t thetime) {
 
 
 
+/*
+ * Determine whether the specified message number is contained within the
+ * specified set.
+ */
+int is_msg_in_mset(char *mset, long msgnum) {
+       int num_sets;
+       int s;
+       char setstr[SIZ], lostr[SIZ], histr[SIZ];       /* was 1024 */
+       long lo, hi;
+
+       /*
+        * Now set it for all specified messages.
+        */
+       num_sets = num_tokens(mset, ',');
+       for (s=0; s<num_sets; ++s) {
+               extract_token(setstr, mset, s, ',');
+
+               extract_token(lostr, setstr, 0, ':');
+               if (num_tokens(setstr, ':') >= 2) {
+                       extract_token(histr, setstr, 1, ':');
+                       if (!strcmp(histr, "*")) {
+                               sprintf(histr, "%ld", LONG_MAX);
+                       }
+               } 
+               else {
+                       strcpy(histr, lostr);
+               }
+               lo = atol(lostr);
+               hi = atol(histr);
 
+               if ((msgnum >= lo) && (msgnum <= hi)) return(1);
+       }
+
+       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;
+                }
+        }
+}