* Holy war on strlen: use IsEmptyStr where apropriate.

[citadel.git] / citadel / tools.c

diff --git a/citadel/tools.c b/citadel/tools.c
index 982d1ae1bee027edbbe5a3fa9d6fd08e2b16c08f..af91ce78fb1d005ddbb40271620b92dcef313426 100644 (file)
--- a/citadel/tools.c
+++ b/citadel/tools.c
@@ -42,11 +42,18 @@ char *ascmonths[12] = {
 
 char *safestrncpy(char *dest, const char *src, size_t n)
 {
+       int i = 0;
+
        if (dest == NULL || src == NULL) {
                fprintf(stderr, "safestrncpy: NULL argument\n");
                abort();
        }
-       strncpy(dest, src, n);
+
+       do {
+               dest[i] = src[i];
+               if (dest[i] == 0) return(dest);
+               ++i;
+       } while (i<n);
        dest[n - 1] = 0;
        return dest;
 }
@@ -75,15 +82,22 @@ int strncasecmp(char *lstr, char *rstr, int len)
 /*
  * num_tokens()  -  discover number of parameters/tokens in a string
  */
-int num_tokens(const char *source, char tok) {
-       int a;
+int num_tokens(const char *source, char tok)
+{
        int count = 1;
+       const char *ptr = source;
 
-       if (source == NULL) return(0);
-       for (a=0; a<strlen(source); ++a) {
-               if (source[a]==tok) ++count;
+       if (source == NULL) {
+               return (0);
        }
-       return(count);
+
+       while (*ptr != '\0') {
+               if (*ptr++ == tok) {
+                       ++count;
+               }
+       }
+       
+       return (count);
 }
 
 
@@ -328,6 +342,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;
+}
 
 
 /*
@@ -335,11 +377,11 @@ int CtdlDecodeBase64(char *dest, const char *source, size_t length)
  */
 void striplt(char *buf)
 {
-       if (strlen(buf) == 0) return;
-        while ((strlen(buf) > 0) && (isspace(buf[0])))
+       if (IsEmptyStr(buf)) return;
+        while ((!IsEmptyStr(buf)) && (isspace(buf[0])))
                 strcpy(buf, &buf[1]);
-       if (strlen(buf) == 0) return;
-        while ((strlen(buf) > 0) && (isspace(buf[strlen(buf) - 1])))
+       if (IsEmptyStr(buf)) return;
+        while ((!IsEmptyStr(buf)) && (isspace(buf[strlen(buf) - 1])))
                 buf[strlen(buf) - 1] = 0;
 }
 
@@ -565,7 +607,7 @@ char *strcpy(char *dest, const char *src) {
 void generate_uuid(char *buf) {
        static int seq = 0;
 
-       sprintf(buf, "%lx-%x-%x",
+       sprintf(buf, "%lx-"F_XPID_T"-%x",
                time(NULL),
                getpid(),
                (seq++)
@@ -634,3 +676,20 @@ char *bmstrcasestr(char *text, char *pattern) {
 
 
 
+/*
+ * Local replacement for controversial C library function that generates
+ * names for temporary files.  Included to shut up compiler warnings.
+ */
+void CtdlMakeTempFileName(char *name, int len) {
+       int i = 0;
+
+       while (i++, i < 100) {
+               snprintf(name, len, "/tmp/ctdl."F_XPID_T".%04x",
+                       getpid(),
+                       rand()
+               );
+               if (!access(name, F_OK)) {
+                       return;
+               }
+       }
+}