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 5cb896c6f16da59bf3b87904e55f75324a94959b..3260e87d0de639197fa31925dada7c370c90372b 100644 (file)
--- a/citadel/tools.c
+++ b/citadel/tools.c
@@ -1,6 +1,8 @@
 /*
- * tools.c -- Miscellaneous routines used by both the client and server.
  * $Id$
+ *
+ * Utility functions that are used by both the client and server.
+ *
  */
 
 #include "sysdep.h"
@@ -8,8 +10,20 @@
 #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"
 
 #define TRUE  1
 #define FALSE 0
@@ -141,7 +155,7 @@ void remove_token(char *source, int parmnum, char separator)
  */
 int extract_int(char *source, int parmnum)
 {
-       char buf[256];
+       char buf[SIZ];
        
        extract_token(buf, source, parmnum, '|');
        return(atoi(buf));
@@ -152,7 +166,7 @@ int extract_int(char *source, int parmnum)
  */
 long extract_long(char *source, long int parmnum)
 {
-       char buf[256];
+       char buf[SIZ];
        
        extract_token(buf, source, parmnum, '|');
        return(atol(buf));
@@ -289,9 +303,9 @@ void decode_base64(char *dest, char *source)
  */
 void striplt(char *buf)
 {
-        while ((strlen(buf) > 0) && (buf[0] == 32))
+        while ((strlen(buf) > 0) && (isspace(buf[0])))
                 strcpy(buf, &buf[1]);
-        while (buf[strlen(buf) - 1] == 32)
+        while (isspace(buf[strlen(buf) - 1]))
                 buf[strlen(buf) - 1] = 0;
 }
 
@@ -382,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;
+                }
+        }
+}