* create format strings different for solaris

[citadel.git] / citadel / tools.c

diff --git a/citadel/tools.c b/citadel/tools.c
index b1c4955327383216185e18a446e41f5ea049b810..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;
+}
 
 
 /*
@@ -569,7 +593,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++)
@@ -638,3 +662,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;
+               }
+       }
+}