* msgbase.c: when a summary mode message list is requested, and the room

[citadel.git] / citadel / tools.c

diff --git a/citadel/tools.c b/citadel/tools.c
index 0f59b34a10075e26b9c51ad3b3025a95cd78f64d..982d1ae1bee027edbbe5a3fa9d6fd08e2b16c08f 100644 (file)
--- a/citadel/tools.c
+++ b/citadel/tools.c
@@ -5,10 +5,6 @@
  *
  */
 
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -94,11 +90,12 @@ int num_tokens(const char *source, char tok) {
 /*
  * extract_token() - a string tokenizer
  */
-void extract_token(char *dest, const char *source, int parmnum, char separator)
+void extract_token(char *dest, const char *source, int parmnum, char separator, int maxlen)
 {
        char *d;                /* dest */
        const char *s;          /* source */
        int count = 0;
+       int len = 0;
 
        strcpy(dest, "");
 
@@ -117,7 +114,7 @@ void extract_token(char *dest, const char *source, int parmnum, char separator)
        }
        if (!s) return;         /* Parameter not found */
 
-       for (d = dest; *s && *s != separator; s++, d++) {
+       for (d = dest; *s && *s != separator && ++len<maxlen; s++, d++) {
                *d = *s;
        }
        *d = 0;
@@ -174,9 +171,9 @@ void remove_token(char *source, int parmnum, char separator)
  */
 int extract_int(const char *source, int parmnum)
 {
-       char buf[SIZ];
+       char buf[32];
        
-       extract_token(buf, source, parmnum, '|');
+       extract_token(buf, source, parmnum, '|', sizeof buf);
        return(atoi(buf));
 }
 
@@ -185,9 +182,9 @@ int extract_int(const char *source, int parmnum)
  */
 long extract_long(const char *source, int parmnum)
 {
-       char buf[SIZ];
+       char buf[32];
        
-       extract_token(buf, source, parmnum, '|');
+       extract_token(buf, source, parmnum, '|', sizeof buf);
        return(atol(buf));
 }
 
@@ -197,9 +194,9 @@ long extract_long(const char *source, int parmnum)
  */
 unsigned long extract_unsigned_long(const char *source, int parmnum)
 {
-       char buf[SIZ];
+       char buf[32];
 
-       extract_token(buf, source, parmnum, '|');
+       extract_token(buf, source, parmnum, '|', sizeof buf);
        return strtoul(buf, NULL, 10);
 }
 
@@ -408,24 +405,21 @@ void fmt_date(char *buf, size_t n, time_t thetime, int seconds) {
 
 /*
  * Determine whether the specified message number is contained within the
- * specified set.
+ * specified sequence set.
  */
-int is_msg_in_mset(char *mset, long msgnum) {
+int is_msg_in_sequence_set(char *mset, long msgnum) {
        int num_sets;
        int s;
-       char setstr[SIZ], lostr[SIZ], histr[SIZ];       /* was 1024 */
+       char setstr[128], lostr[128], histr[128];
        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(setstr, mset, s, ',', sizeof setstr);
 
-               extract_token(lostr, setstr, 0, ':');
+               extract_token(lostr, setstr, 0, ':', sizeof lostr);
                if (num_tokens(setstr, ':') >= 2) {
-                       extract_token(histr, setstr, 1, ':');
+                       extract_token(histr, setstr, 1, ':', sizeof histr);
                        if (!strcmp(histr, "*")) {
                                snprintf(histr, sizeof histr, "%ld", LONG_MAX);
                        }
@@ -552,18 +546,41 @@ void urlesc(char *outbuf, char *strbuf)
 }
 
 
+
 /*
- * bmstrstr() is a variant of strstr() that uses the Boyer-Moore search
- * algorithm, and can use any caller-supplied string compare function whose
- * calling syntax is similar to strncmp().  For example, we can supply it
- * with strncasecmp() to do a case-insensitive search.
- * 
- * Original code: copyright (c) 1997-1998 by Urs Janssen <urs@tin.org>
- * Modifications: copyright (c) 2003 by Art Cancro <ajc@uncensored.citadel.org>
+ * In our world, we want strcpy() to be able to work with overlapping strings.
  */
-char *bmstrstr(char *text, char *pattern,
-       int (*cmpfunc)(const char *, const char *, size_t) )
-{
+#ifdef strcpy
+#undef strcpy
+#endif
+char *strcpy(char *dest, const char *src) {
+       memmove(dest, src, (strlen(src) + 1) );
+       return(dest);
+}
+
+
+/*
+ * Generate a new, globally unique UID parameter for a calendar etc. object
+ */
+void generate_uuid(char *buf) {
+       static int seq = 0;
+
+       sprintf(buf, "%lx-%x-%x",
+               time(NULL),
+               getpid(),
+               (seq++)
+       );
+}
+
+/*
+ * bmstrcasestr() -- case-insensitive substring search
+ *
+ * This uses the Boyer-Moore search algorithm and is therefore quite fast.
+ * The code is roughly based on the strstr() replacement from 'tin' written
+ * by Urs Jannsen.
+ */
+char *bmstrcasestr(char *text, char *pattern) {
+
        register unsigned char *p, *t;
        register int i, j, *delta;
        register size_t p1;
@@ -571,11 +588,8 @@ char *bmstrstr(char *text, char *pattern,
        size_t textlen;
        size_t patlen;
 
-       if (text == NULL) return(NULL);
-       if (pattern == NULL) return(NULL);
-
-       textlen = strlen(text);
-       patlen = strlen(pattern);
+       textlen = strlen (text);
+       patlen = strlen (pattern);
 
        /* algorithm fails if pattern is empty */
        if ((p1 = patlen) == 0)
@@ -590,7 +604,7 @@ char *bmstrstr(char *text, char *pattern,
        for (i = 0; i <= 255; i++)
                delta[i] = p1;
        for (p = (unsigned char *) pattern, i = p1; --i > 0;)
-               delta[*p++] = i;
+               delta[tolower(*p++)] = i;
 
        /*
         * From now on, we want patlen - 1.
@@ -603,11 +617,13 @@ char *bmstrstr(char *text, char *pattern,
        p = (unsigned char *) pattern + p1;
        t = (unsigned char *) text + p1;
        i = textlen - patlen;
-       while (1) {
-               if (tolower(*p) == tolower(*t)
-                  && cmpfunc((p - p1), (t - p1), p1) == 0)
-                       return ((char *) t - p1);
-               j = delta[*t];
+       while(1) {
+               if (tolower(p[0]) == tolower(t[0])) {
+                       if (strncasecmp ((const char *)(p - p1), (const char *)(t - p1), p1) == 0) {
+                               return ((char *)t - p1);
+                       }
+               }
+               j = delta[tolower(t[0])];
                if (i < j)
                        break;
                i -= j;
@@ -615,3 +631,6 @@ char *bmstrstr(char *text, char *pattern,
        }
        return (NULL);
 }
+
+
+