* create format strings different for solaris

[citadel.git] / citadel / tools.c

diff --git a/citadel/tools.c b/citadel/tools.c
index 4564aa58e454875e509ab0b8d5eb447290e3fb21..0f85643ee1ad003b2db388e7bf0bc17af6103136 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>
@@ -332,6 +328,34 @@ int CtdlDecodeBase64(char *dest, const char *source, size_t length)
     }
 }
 
+/*
+ * if we send out non ascii subjects, we encode it this way.
+ */
+char *rfc2047encode(char *line, long length)
+{
+       char *AlreadyEncoded;
+       char *result;
+       long end;
+#define UTF8_HEADER "=?UTF-8?B?"
+
+       /* check if we're already done */
+       AlreadyEncoded = strstr(line, "=?");
+       if ((AlreadyEncoded != NULL) &&
+           ((strstr(AlreadyEncoded, "?B?") != NULL)||
+            (strstr(AlreadyEncoded, "?Q?") != NULL)))
+       {
+               return strdup(line);
+       }
+
+       result = (char*) malloc(strlen(UTF8_HEADER) + 4 + length * 2);
+       strncpy (result, UTF8_HEADER, strlen (UTF8_HEADER));
+       CtdlEncodeBase64(result + strlen(UTF8_HEADER), line, length);
+       end = strlen (result);
+        result[end]='?';
+       result[end+1]='=';
+       result[end+2]='\0';
+       return result;
+}
 
 
 /*
@@ -550,18 +574,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-"F_XPID_T"-%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;
@@ -569,11 +616,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)
@@ -588,7 +632,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.
@@ -601,11 +645,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,27 +661,21 @@ char *bmstrstr(char *text, char *pattern,
 }
 
 
-/*
- * In our world, we want strcpy() to be able to work with overlapping strings.
- */
-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
+ * Local replacement for controversial C library function that generates
+ * names for temporary files.  Included to shut up compiler warnings.
  */
-void generate_uuid(char *buf) {
-       static int seq = 0;
+void CtdlMakeTempFileName(char *name, int len) {
+       int i = 0;
 
-       sprintf(buf, "%08x-%04x-%04x-%04x-%012x",
-               (int)time(NULL),
-               (seq++),
-               getpid(),
-               rand(),
-               rand()
-       );
+       while (i++, i < 100) {
+               snprintf(name, len, "/tmp/ctdl."F_XPID_T".%04x",
+                       getpid(),
+                       rand()
+               );
+               if (!access(name, F_OK)) {
+                       return;
+               }
+       }
 }
-