2007-01-21 [colin] 2.7.1cvs44
[claws.git] / src / common / utils.c
index fdc1a0db6bf5335a0693c5aa112aec4e8547fea7..c1d1d84c15c4cc67c3358f771905e2c5254b8cbd 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Sylpheed-Claws Team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #include "defs.h"
 
 #include <glib.h>
-#ifdef ENABLE_NLS
+
 #include <glib/gi18n.h>
-#else
-#define _(a) (a)
-#define N_(a) (a)
-#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -170,12 +167,12 @@ gint g_chmod(const gchar *path, gint mode)
 gint mkstemp_name(const gchar *template, gchar **name_used)
 {
        static gulong count=0; /* W32-_mktemp only supports up to 27
-                                  tempfiles... */
+                                 tempfiles... */
        int tmpfd;
 
        *name_used = g_strdup_printf("%s.%ld",_mktemp(template),count++);
        tmpfd = open (*name_used, (O_CREAT | O_RDWR | O_BINARY),
-                                    (S_IRUSR | S_IWUSR));
+                                   (S_IRUSR | S_IWUSR));
 
        tempfiles=g_slist_append(tempfiles, g_strdup(*name_used));
        if (tmpfd<0) {
@@ -334,20 +331,41 @@ gchar *itos(gint n)
        return itos_buf(nstr, n);
 }
 
+#define divide(num,divisor,i,d)                \
+{                                      \
+       i = num >> divisor;             \
+       d = num & ((1<<divisor)-1);     \
+       d = (d*100) >> divisor;         \
+}
+
 gchar *to_human_readable(off_t size)
 {
-       static gchar str[10];
-
-       if (size < 1024)
-               g_snprintf(str, sizeof(str), _("%dB"), (gint)size);
-       else if (size >> 10 < 1024)
-               g_snprintf(str, sizeof(str), _("%.1fKB"), (gfloat)size / (1 << 10));
-       else if (size >> 20 < 1024)
-               g_snprintf(str, sizeof(str), _("%.2fMB"), (gfloat)size / (1 << 20));
-       else
-               g_snprintf(str, sizeof(str), _("%.2fGB"), (gfloat)size / (1 << 30));
-
-       return str;
+       static gchar str[14];
+       static gchar *b_format = NULL, *kb_format = NULL, 
+                    *mb_format = NULL, *gb_format = NULL;
+       register int t = 0, r = 0;
+       if (b_format == NULL) {
+               b_format  = _("%dB");
+               kb_format = _("%d.%02dKB");
+               mb_format = _("%d.%02dMB");
+               gb_format = _("%.2fGB");
+       }
+       
+       if (size < (off_t)1024) {
+               g_snprintf(str, sizeof(str), b_format, (gint)size);
+               return str;
+       } else if (size >> 10 < (off_t)1024) {
+               divide(size, 10, t, r);
+               g_snprintf(str, sizeof(str), kb_format, t, r);
+               return str;
+       } else if (size >> 20 < (off_t)1024) {
+               divide(size, 20, t, r);
+               g_snprintf(str, sizeof(str), mb_format, t, r);
+               return str;
+       } else {
+               g_snprintf(str, sizeof(str), gb_format, (gfloat)size / (1 << 30));
+               return str;
+       }
 }
 
 /* strcmp with NULL-checking */
@@ -370,21 +388,21 @@ gchar *strstr2(const gchar *s1, const gchar *s2)
 gint path_cmp(const gchar *s1, const gchar *s2)
 {
        gint len1, len2;
-        int rc;
+       int rc;
 #ifdef G_OS_WIN32
-        gchar *s1buf, *s2buf;
+       gchar *s1buf, *s2buf;
 #endif
 
        if (s1 == NULL || s2 == NULL) return -1;
        if (*s1 == '\0' || *s2 == '\0') return -1;
 
 #ifdef G_OS_WIN32
-        s1buf = g_strdup (s1);
-        s2buf = g_strdup (s2);
-        subst_char (s1buf, '/', G_DIR_SEPARATOR);
-        subst_char (s2buf, '/', G_DIR_SEPARATOR);
-        s1 = s1buf;
-        s2 = s2buf;
+       s1buf = g_strdup (s1);
+       s2buf = g_strdup (s2);
+       subst_char (s1buf, '/', G_DIR_SEPARATOR);
+       subst_char (s2buf, '/', G_DIR_SEPARATOR);
+       s1 = s1buf;
+       s2 = s2buf;
 #endif /* !G_OS_WIN32 */
 
        len1 = strlen(s1);
@@ -395,10 +413,10 @@ gint path_cmp(const gchar *s1, const gchar *s2)
 
        rc = strncmp(s1, s2, MAX(len1, len2));
 #ifdef G_OS_WIN32
-        g_free (s1buf);
-        g_free (s2buf);
+       g_free (s1buf);
+       g_free (s2buf);
 #endif /* !G_OS_WIN32 */
-        return rc;
+       return rc;
 }
 
 /* remove trailing return code */
@@ -535,210 +553,6 @@ gchar *strncpy2(gchar *dest, const gchar *src, size_t n)
        return dest;
 }
 
-#if !HAVE_ISWALNUM
-int iswalnum(wint_t wc)
-{
-       return g_ascii_isalnum((int)wc);
-}
-#endif
-
-#if !HAVE_ISWSPACE
-int iswspace(wint_t wc)
-{
-       return g_ascii_isspace((int)wc);
-}
-#endif
-
-#if !HAVE_TOWLOWER
-wint_t towlower(wint_t wc)
-{
-       if (wc >= L'A' && wc <= L'Z')
-               return wc + L'a' - L'A';
-
-       return wc;
-}
-#endif
-
-#if !HAVE_WCSLEN
-size_t wcslen(const wchar_t *s)
-{
-       size_t len = 0;
-
-       while (*s != L'\0')
-               ++len, ++s;
-
-       return len;
-}
-#endif
-
-#if !HAVE_WCSCPY
-/* Copy SRC to DEST.  */
-wchar_t *wcscpy(wchar_t *dest, const wchar_t *src)
-{
-       wint_t c;
-       wchar_t *s = dest;
-
-       do {
-               c = *src++;
-               *dest++ = c;
-       } while (c != L'\0');
-
-       return s;
-}
-#endif
-
-#if !HAVE_WCSNCPY
-/* Copy no more than N wide-characters of SRC to DEST.  */
-wchar_t *wcsncpy (wchar_t *dest, const wchar_t *src, size_t n)
-{
-       wint_t c;
-       wchar_t *s = dest;
-
-       do {
-               c = *src++;
-               *dest++ = c;
-               if (--n == 0)
-                       return s;
-       } while (c != L'\0');
-
-       /* zero fill */
-       do
-               *dest++ = L'\0';
-       while (--n > 0);
-
-       return s;
-}
-#endif
-
-/* Duplicate S, returning an identical malloc'd string. */
-wchar_t *wcsdup(const wchar_t *s)
-{
-       wchar_t *new_str;
-
-       if (s) {
-               new_str = g_new(wchar_t, wcslen(s) + 1);
-               wcscpy(new_str, s);
-       } else
-               new_str = NULL;
-
-       return new_str;
-}
-
-/* Duplicate no more than N wide-characters of S,
-   returning an identical malloc'd string. */
-wchar_t *wcsndup(const wchar_t *s, size_t n)
-{
-       wchar_t *new_str;
-
-       if (s) {
-               new_str = g_new(wchar_t, n + 1);
-               wcsncpy(new_str, s, n);
-               new_str[n] = (wchar_t)0;
-       } else
-               new_str = NULL;
-
-       return new_str;
-}
-
-wchar_t *strdup_mbstowcs(const gchar *s)
-{
-       wchar_t *new_str;
-
-       if (s) {
-               new_str = g_new(wchar_t, strlen(s) + 1);
-               if (mbstowcs(new_str, s, strlen(s) + 1) < 0) {
-                       g_free(new_str);
-                       new_str = NULL;
-               } else
-                       new_str = g_realloc(new_str,
-                                           sizeof(wchar_t) * (wcslen(new_str) + 1));
-       } else
-               new_str = NULL;
-
-       return new_str;
-}
-
-gchar *strdup_wcstombs(const wchar_t *s)
-{
-       gchar *new_str;
-       size_t len;
-
-       if (s) {
-               len = wcslen(s) * MB_CUR_MAX + 1;
-               new_str = g_new(gchar, len);
-               if (wcstombs(new_str, s, len) < 0) {
-                       g_free(new_str);
-                       new_str = NULL;
-               } else
-                       new_str = g_realloc(new_str, strlen(new_str) + 1);
-       } else
-               new_str = NULL;
-
-       return new_str;
-}
-
-/* Compare S1 and S2, ignoring case.  */
-gint wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n)
-{
-       wint_t c1;
-       wint_t c2;
-
-       while (n--) {
-               c1 = towlower(*s1++);
-               c2 = towlower(*s2++);
-               if (c1 != c2)
-                       return c1 - c2;
-               else if (c1 == 0 && c2 == 0)
-                       break;
-       }
-
-       return 0;
-}
-
-/* Find the first occurrence of NEEDLE in HAYSTACK, ignoring case.  */
-wchar_t *wcscasestr(const wchar_t *haystack, const wchar_t *needle)
-{
-       register size_t haystack_len, needle_len;
-
-       haystack_len = wcslen(haystack);
-       needle_len   = wcslen(needle);
-
-       if (haystack_len < needle_len || needle_len == 0)
-               return NULL;
-
-       while (haystack_len >= needle_len) {
-               if (!wcsncasecmp(haystack, needle, needle_len))
-                       return (wchar_t *)haystack;
-               else {
-                       haystack++;
-                       haystack_len--;
-               }
-       }
-
-       return NULL;
-}
-
-gint get_mbs_len(const gchar *s)
-{
-       const gchar *p = s;
-       gint mb_len;
-       gint len = 0;
-
-       if (!p)
-               return -1;
-
-       while (*p != '\0') {
-               mb_len = g_utf8_skip[*(guchar *)p];
-               if (mb_len == 0)
-                       break;
-               else
-                       len++;
-
-               p += mb_len;
-       }
-
-       return len;
-}
 
 /* Examine if next block is non-ASCII string */
 gboolean is_next_nonascii(const gchar *s)
@@ -1700,7 +1514,7 @@ GList *uri_list_extract_filenames(const gchar *uri_list)
                                        strncpy(escaped_utf8uri, p, q - p + 1);
                                        escaped_utf8uri[q - p + 1] = '\0';
                                        decode_uri(file, escaped_utf8uri);
-                    /*
+                   /*
                     * g_filename_from_uri() rejects escaped/locale encoded uri
                     * string which come from Nautilus.
                     */
@@ -1757,6 +1571,8 @@ static gint axtoi(const gchar *hexstr)
 
 gboolean is_uri_string(const gchar *str)
 {
+       while (str && *str && g_ascii_isspace(*str))
+               str++;
        return (g_ascii_strncasecmp(str, "http://", 7) == 0 ||
                g_ascii_strncasecmp(str, "https://", 8) == 0 ||
                g_ascii_strncasecmp(str, "ftp://", 6) == 0 ||
@@ -1765,6 +1581,8 @@ gboolean is_uri_string(const gchar *str)
 
 gchar *get_uri_path(const gchar *uri)
 {
+       while (uri && *uri && g_ascii_isspace(*uri))
+               uri++;
        if (g_ascii_strncasecmp(uri, "http://", 7) == 0)
                return (gchar *)(uri + 7);
        else if (g_ascii_strncasecmp(uri, "https://", 8) == 0)
@@ -1821,10 +1639,14 @@ void decode_uri(gchar *decoded_uri, const gchar *encoded_uri)
 }
 
 gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
-                    gchar **subject, gchar **body)
+                    gchar **subject, gchar **body, gchar **attach)
 {
        gchar *tmp_mailto;
        gchar *p;
+       const gchar *forbidden_uris[] = { ".gnupg/",
+                                         "/etc/passwd",
+                                         "/etc/shadow",
+                                         NULL };
 
        Xstrdup_a(tmp_mailto, mailto, return -1);
 
@@ -1871,6 +1693,19 @@ gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
                } else if (body && !*body && !g_ascii_strcasecmp(field, "body")) {
                        *body = g_malloc(strlen(value) + 1);
                        decode_uri(*body, value);
+               } else if (attach && !*attach && !g_ascii_strcasecmp(field, "attach")) {
+                       int i = 0;
+                       *attach = g_malloc(strlen(value) + 1);
+                       decode_uri(*attach, value);
+                       for (; forbidden_uris[i]; i++) {
+                               if (strstr(*attach, forbidden_uris[i])) {
+                                       printf("Refusing to attach '%s', potential private data leak\n",
+                                                       *attach);
+                                       g_free(*attach);
+                                       *attach = NULL;
+                                       break;
+                               }
+                       }
                }
        }
 
@@ -1901,8 +1736,8 @@ w32_strerror (int w32_errno)
   if (w32_errno == 0)
     w32_errno = ec;
   FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, w32_errno,
-                 MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
-                 strerr, DIM (strerr)-1, NULL);
+                MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
+                strerr, DIM (strerr)-1, NULL);
   return strerr;
 }
 
@@ -1920,7 +1755,7 @@ dlsym (void * hd, const char * sym)
     {
       void * fnc = GetProcAddress (hd, sym);
       if (!fnc)
-        return NULL;
+       return NULL;
       return fnc;
     }
   return NULL;
@@ -1960,18 +1795,18 @@ w32_shgetfolderpath (HWND a, int b, HANDLE c, DWORD d, LPSTR e)
       initialized = 1;
 
       for (i=0, handle = NULL; !handle && dllnames[i]; i++)
-        {
-          handle = dlopen (dllnames[i], RTLD_LAZY);
-          if (handle)
-            {
-              func = dlsym (handle, "SHGetFolderPathA");
-              if (!func)
-                {
-                  dlclose (handle);
-                  handle = NULL;
-                }
-            }
-        }
+       {
+         handle = dlopen (dllnames[i], RTLD_LAZY);
+         if (handle)
+           {
+             func = dlsym (handle, "SHGetFolderPathA");
+             if (!func)
+               {
+                 dlclose (handle);
+                 handle = NULL;
+               }
+           }
+       }
     }
 
   if (func)
@@ -1979,23 +1814,73 @@ w32_shgetfolderpath (HWND a, int b, HANDLE c, DWORD d, LPSTR e)
   else
     return -1;
 }
+
+/* Returns a static string with the directroy from which the module
+   has been loaded.  Returns an empty string on error. */
+static char *w32_get_module_dir(void)
+{
+       static char *moddir;
+
+       if (!moddir) {
+               char name[MAX_PATH+10];
+               char *p;
+
+               if ( !GetModuleFileNameA (0, name, sizeof (name)-10) )
+                       *name = 0;
+               else {
+                       p = strrchr (name, '\\');
+                       if (p)
+                               *p = 0;
+                       else
+                               *name = 0;
+               }
+               moddir = g_strdup (name);
+       }
+       return moddir;
+}
+#endif /* G_OS_WIN32 */
+
+/* Return a static string with the locale dir. */
+const gchar *get_locale_dir(void)
+{
+       static gchar *loc_dir;
+
+#ifdef G_OS_WIN32
+       if (!loc_dir)
+               loc_dir = g_strconcat(w32_get_module_dir(), G_DIR_SEPARATOR_S,
+                                     "\\share\\locale", NULL);
 #endif
+       if (!loc_dir)
+               loc_dir = LOCALEDIR;
+       
+       return loc_dir;
+}
+
 
 const gchar *get_home_dir(void)
 {
 #ifdef G_OS_WIN32
        static char home_dir[MAX_PATH] = "";
 
-       if (home_dir[0] == '\0')
-               {
-                       if (w32_shgetfolderpath
+       if (home_dir[0] == '\0') {
+               if (w32_shgetfolderpath
                            (NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE,
                             NULL, 0, home_dir) < 0)
                                strcpy (home_dir, "C:\\Sylpheed");
        }
        return home_dir;
 #else
-       return g_get_home_dir();
+       static const gchar *homeenv = NULL;
+
+       if (homeenv)
+               return homeenv;
+
+       if (!homeenv && g_getenv("HOME") != NULL)
+               homeenv = g_strdup(g_getenv("HOME"));
+       if (!homeenv)
+               homeenv = g_get_home_dir();
+
+       return homeenv;
 #endif
 }
 
@@ -2098,12 +1983,21 @@ const gchar *get_plugin_dir(void)
        static gchar *plugin_dir = NULL;
 
        if (!plugin_dir)
-                plugin_dir = g_strconcat(sylpheed_get_startup_dir(),
-                                         "\\lib\\sylpheed-claws\\plugins\\",
-                                         NULL);
+               plugin_dir = g_strconcat(w32_get_module_dir(),
+                                        "\\lib\\claws-mail\\plugins\\",
+                                        NULL);
        return plugin_dir;
 #else
-        return PLUGINDIR;
+       if (is_dir_exist(PLUGINDIR))
+               return PLUGINDIR;
+       else {
+               static gchar *plugin_dir = NULL;
+               if (!plugin_dir)
+                       plugin_dir = g_strconcat(get_rc_dir(), 
+                               G_DIR_SEPARATOR_S, "plugins", 
+                               G_DIR_SEPARATOR_S, NULL);
+               return plugin_dir;                      
+       }
 #endif
 }
 
@@ -2171,6 +2065,18 @@ off_t get_file_size(const gchar *file)
        return s.st_size;
 }
 
+time_t get_file_mtime(const gchar *file)
+{
+       struct stat s;
+
+       if (g_stat(file, &s) < 0) {
+               FILE_OP_ERROR(file, "stat");
+               return -1;
+       }
+
+       return s.st_mtime;
+}
+
 off_t get_file_size_as_crlf(const gchar *file)
 {
        FILE *fp;
@@ -2247,21 +2153,21 @@ gboolean file_exist(const gchar *file, gboolean allow_fifo)
  * straightforward for Unix but more complex for Windows. */
 gboolean is_relative_filename(const gchar *file)
 {
-        if (!file)
-                return TRUE;
+       if (!file)
+               return TRUE;
 #ifdef G_OS_WIN32
-        if ( *file == '\\' && file[1] == '\\' && strchr (file+2, '\\') )
-                return FALSE; /* Prefixed with a hostname - this can't
-                               * be a relative name. */
+       if ( *file == '\\' && file[1] == '\\' && strchr (file+2, '\\') )
+               return FALSE; /* Prefixed with a hostname - this can't
+                              * be a relative name. */
 
-        if ( ((*file >= 'a' && *file <= 'z')
-              || (*file >= 'A' && *file <= 'Z'))
-             && file[1] == ':')
-                file += 2;  /* Skip drive letter. */
+       if ( ((*file >= 'a' && *file <= 'z')
+             || (*file >= 'A' && *file <= 'Z'))
+            && file[1] == ':')
+               file += 2;  /* Skip drive letter. */
 
-        return !(*file == '\\' || *file == '/');
+       return !(*file == '\\' || *file == '/');
 #else
-        return !(*file == G_DIR_SEPARATOR);
+       return !(*file == G_DIR_SEPARATOR);
 #endif
 }
 
@@ -3166,8 +3072,8 @@ gchar *get_outgoing_rfc2822_str(FILE *fp)
  *   boundary := 0*69<bchars> bcharsnospace
  *   bchars := bcharsnospace / " "
  *   bcharsnospace := DIGIT / ALPHA / "'" / "(" / ")" /
- *                    "+" / "_" / "," / "-" / "." /
- *                    "/" / ":" / "=" / "?"
+ *                 "+" / "_" / "," / "-" / "." /
+ *                 "/" / ":" / "=" / "?"
  *
  * some special characters removed because of buggy MTAs
  */
@@ -3208,12 +3114,13 @@ FILE *my_tmpfile(void)
        gchar *fname;
        gint fd;
        FILE *fp;
+       gchar buf[2]="\0";
 
        tmpdir = get_tmp_dir();
        tmplen = strlen(tmpdir);
        progname = g_get_prgname();
        if (progname == NULL)
-               progname = "sylpheed-claws";
+               progname = "claws-mail";
        proglen = strlen(progname);
        Xalloca(fname, tmplen + 1 + proglen + sizeof(suffix),
                return tmpfile());
@@ -3229,13 +3136,23 @@ FILE *my_tmpfile(void)
 
 #ifndef G_OS_WIN32
        g_unlink(fname);
+       
+       /* verify that we can write in the file after unlinking */
+       if (write(fd, buf, 1) < 0) {
+               close(fd);
+               return tmpfile();
+       }
+       
 #endif
 
        fp = fdopen(fd, "w+b");
        if (!fp)
                close(fd);
-       else
+       else {
+               rewind(fp);
                return fp;
+       }
+
 #endif /* HAVE_MKSTEMP || G_OS_WIN32 */
 
        return tmpfile();
@@ -3245,12 +3162,12 @@ FILE *get_tmpfile_in_dir(const gchar *dir, gchar **filename)
 {
        int fd;
 #ifdef G_OS_WIN32
-       char *template = g_strdup_printf ("%s%csylpheed.XXXXXX",
-                                          dir, G_DIR_SEPARATOR);
+       char *template = g_strdup_printf ("%s%cclaws.XXXXXX",
+                                         dir, G_DIR_SEPARATOR);
        fd = mkstemp_name(template, filename);
        g_free(template);
 #else
-       *filename = g_strdup_printf("%s%csylpheed.XXXXXX", dir, G_DIR_SEPARATOR);
+       *filename = g_strdup_printf("%s%cclaws.XXXXXX", dir, G_DIR_SEPARATOR);
        fd = mkstemp(*filename);
 #endif
        return fdopen(fd, "w+");
@@ -3377,20 +3294,20 @@ gchar *file_read_stream_to_str(FILE *fp)
        return str;
 }
 
-gint execute_async(gchar *const argv[])
+static gint execute_async(gchar *const argv[])
 {
        g_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
 
        if (g_spawn_async(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH,
                          NULL, NULL, NULL, FALSE) == FALSE) {
-               g_warning("Can't execute command: %s\n", argv[0]);
+               g_warning("Couldn't execute command: %s\n", argv[0]);
                return -1;
        }
 
        return 0;
 }
 
-gint execute_sync(gchar *const argv[])
+static gint execute_sync(gchar *const argv[])
 {
        gint status;
 
@@ -3398,7 +3315,7 @@ gint execute_sync(gchar *const argv[])
 
        if (g_spawn_sync(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH,
                         NULL, NULL, NULL, NULL, &status, NULL) == FALSE) {
-               g_warning("Can't execute command: %s\n", argv[0]);
+               g_warning("Couldn't execute command: %s\n", argv[0]);
                return -1;
        }
 
@@ -3442,7 +3359,7 @@ gchar *get_command_output(const gchar *cmdline)
 
        if (g_spawn_command_line_sync(cmdline, &child_stdout, NULL, &status,
                                      NULL) == FALSE) {
-               g_warning("Can't execute command: %s\n", cmdline);
+               g_warning("Couldn't execute command: %s\n", cmdline);
                return NULL;
        }
 
@@ -3461,7 +3378,7 @@ static gint is_unchanged_uri_char(char c)
        }
 }
 
-void encode_uri(gchar *encoded_uri, gint bufsize, const gchar *uri)
+static void encode_uri(gchar *encoded_uri, gint bufsize, const gchar *uri)
 {
        int i;
        int k;
@@ -3718,8 +3635,8 @@ void debug_print_real(const gchar *format, ...)
 
 const char * debug_srcname(const char *file)
 {
-        const char *s = strrchr (file, '/');
-        return s? s+1:file;
+       const char *s = strrchr (file, '/');
+       return s? s+1:file;
 }
 
 
@@ -3775,7 +3692,11 @@ int subject_get_prefix_length(const gchar *subject)
                "Fw\\:",                        /* "Fw:" Forward */
                "Enc\\:",                       /* "Enc:" Forward (Brazilian Outlook) */
                "Odp\\:",                       /* "Odp:" Re (Polish Outlook) */
-               "Rif\\:"                        /* "Rif:" (Italian Outlook) */
+               "Rif\\:",                       /* "Rif:" (Italian Outlook) */
+               "Sv\\:",                        /* "Sv" (Norwegian) */
+               "Vs\\:",                        /* "Vs" (Norwegian) */
+               "Ad\\:",                        /* "Ad" (Norwegian) */
+               "\347\255\224\345\244\215\\:"   /* "Re" (Chinese, UTF-8) */
                /* add more */
        };
        const int PREFIXES = sizeof prefixes / sizeof prefixes[0];
@@ -3827,8 +3748,7 @@ guint g_stricase_hash(gconstpointer gptr)
        const char *str;
 
        for (str = gptr; str && *str; str++) {
-               if (isupper((guchar)*str)) hash_result += (*str + ' ');
-               else hash_result += *str;
+               hash_result += toupper(*str);
        }
 
        return hash_result;
@@ -3839,7 +3759,7 @@ gint g_stricase_equal(gconstpointer gptr1, gconstpointer gptr2)
        const char *str1 = gptr1;
        const char *str2 = gptr2;
 
-       return !g_utf8_collate(str1, str2);
+       return !strcasecmp(str1, str2);
 }
 
 gint g_int_compare(gconstpointer a, gconstpointer b)
@@ -4232,6 +4152,7 @@ gboolean get_uri_part(const gchar *start, const gchar *scanpos,
                             const gchar **bp, const gchar **ep, gboolean hdr)
 {
        const gchar *ep_;
+       gint parenthese_cnt = 0;
 
        g_return_val_if_fail(start != NULL, FALSE);
        g_return_val_if_fail(scanpos != NULL, FALSE);
@@ -4244,8 +4165,16 @@ gboolean get_uri_part(const gchar *start, const gchar *scanpos,
        for (ep_ = scanpos; *ep_ != '\0'; ep_++) {
                if (!g_ascii_isgraph(*(const guchar *)ep_) ||
                    !IS_ASCII(*(const guchar *)ep_) ||
-                   strchr("[]{}()<>\"", *ep_))
+                   strchr("[]{}<>\"", *ep_)) {
                        break;
+               } else if (strchr("(", *ep_)) {
+                       parenthese_cnt++;
+               } else if (strchr(")", *ep_)) {
+                       if (parenthese_cnt > 0)
+                               parenthese_cnt--;
+                       else
+                               break;
+               }
        }
 
        /* no punctuation at end of string */
@@ -4254,7 +4183,7 @@ gboolean get_uri_part(const gchar *start, const gchar *scanpos,
         * should pass some URI type to this function and decide on that whether
         * to perform punctuation stripping */
 
-#define IS_REAL_PUNCT(ch)      (g_ascii_ispunct(ch) && !strchr("/?=-", ch))
+#define IS_REAL_PUNCT(ch)      (g_ascii_ispunct(ch) && !strchr("/?=-)", ch))
 
        for (; ep_ - 1 > scanpos + 1 &&
               IS_REAL_PUNCT(*(ep_ - 1));
@@ -4270,6 +4199,8 @@ gboolean get_uri_part(const gchar *start, const gchar *scanpos,
 
 gchar *make_uri_string(const gchar *bp, const gchar *ep)
 {
+       while (bp && *bp && g_ascii_isspace(*bp))
+               bp++;
        return g_strndup(bp, ep - bp);
 }
 
@@ -4314,7 +4245,7 @@ static GHashTable *create_domain_tab(void)
            "tc", "td", "tf", "tg", "th", "tj", "tk", "tm", "tn", "to",
            "tp", "tr", "tt", "tv", "tw", "tz", "ua", "ug", "uk", "um",
            "us", "uy", "uz", "va", "vc", "ve", "vg", "vi", "vn", "vu",
-            "wf", "ws", "ye", "yt", "yu", "za", "zm", "zw"
+           "wf", "ws", "ye", "yt", "yu", "za", "zm", "zw"
        };
        gint n;
        GHashTable *htab = g_hash_table_new(g_stricase_hash, g_stricase_equal);
@@ -4368,16 +4299,36 @@ gboolean get_email_part(const gchar *start, const gchar *scanpos,
        g_return_val_if_fail(ep != NULL, FALSE);
 
        if (hdr) {
+               const gchar *start_quote = NULL;
+               const gchar *end_quote = NULL;
 search_again:
                /* go to the real start */
                if (start[0] == ',')
                        start++;
                if (start[0] == ';')
                        start++;
+               while (start[0] == '\n' || start[0] == '\r')
+                       start++;
                while (start[0] == ' ' || start[0] == '\t')
                        start++;
 
                *bp = start;
+               
+               /* check if there are quotes (to skip , in them) */
+               if (*start == '"') {
+                       start_quote = start;
+                       start++;
+                       end_quote = strstr(start, "\"");
+               } else {
+                       start_quote = NULL;
+                       end_quote = NULL;
+               }
+               
+               /* skip anything between quotes */
+               if (start_quote && end_quote) {
+                       start = end_quote;
+                       
+               } 
 
                /* find end (either , or ; or end of line) */
                if (strstr(start, ",") && strstr(start, ";"))
@@ -4390,6 +4341,11 @@ search_again:
                else
                        *ep = start+strlen(start);
 
+               /* go back to real start */
+               if (start_quote && end_quote) {
+                       start = start_quote;
+               }
+
                /* check there's still an @ in that, or search
                 * further if possible */
                if (strstr(start, "@") && strstr(start, "@") < *ep)
@@ -4397,6 +4353,9 @@ search_again:
                else if (*ep < start+strlen(start)) {
                        start = *ep;
                        goto search_again;
+               } else if (start_quote && strstr(start, "\"") && strstr(start, "\"") < *ep) {
+                       *bp = start_quote;
+                       return TRUE;
                } else
                        return FALSE;
        }
@@ -4424,7 +4383,7 @@ search_again:
                                last_dot = ep_;
                                if (*(last_dot + 1) == '.') {
                                        if (prelast_dot == NULL)
-                                               return FALSE;
+                                               return FALSE;
                                        last_dot = prelast_dot;
                                        break;
                                }
@@ -4571,6 +4530,8 @@ gchar *make_http_string(const gchar *bp, const gchar *ep)
        gchar *tmp;
        gchar *result;
 
+       while (bp && *bp && g_ascii_isspace(*bp))
+               bp++;
        tmp = g_strndup(bp, ep - bp);
        result = g_strconcat("http://", tmp, NULL);
        g_free(tmp);
@@ -4578,7 +4539,7 @@ gchar *make_http_string(const gchar *bp, const gchar *ep)
        return result;
 }
 
-static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type)
+static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type, const gchar *file_to_open)
 {
        FILE *fp = fopen(path, "rb");
        gchar buf[BUFFSIZE];
@@ -4586,27 +4547,71 @@ static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type)
        if (!fp)
                return NULL;
        while (fgets(buf, sizeof (buf), fp) != NULL) {
-               gchar **parts = g_strsplit(buf, ";", -1);
+               gchar **parts = g_strsplit(buf, ";", 3);
                gchar *trimmed = parts[0];
-               while (trimmed[0] == ' ')
+               while (trimmed[0] == ' ' || trimmed[0] == '\t')
                        trimmed++;
-               while (trimmed[strlen(trimmed)-1] == ' ')
+               while (trimmed[strlen(trimmed)-1] == ' ' || trimmed[strlen(trimmed)-1] == '\t')
                        trimmed[strlen(trimmed)-1] = '\0';
 
                if (!strcmp(trimmed, type)) {
+                       gboolean needsterminal = FALSE;
+                       if (parts[2] && strstr(parts[2], "needsterminal")) {
+                               needsterminal = TRUE;
+                       }
+                       if (parts[2] && strstr(parts[2], "test=")) {
+                               gchar *orig_testcmd = g_strdup(strstr(parts[2], "test=")+5);
+                               gchar *testcmd = orig_testcmd;
+                               if (strstr(testcmd,";"))
+                                       *(strstr(testcmd,";")) = '\0';
+                               while (testcmd[0] == ' ' || testcmd[0] == '\t')
+                                       testcmd++;
+                               while (testcmd[strlen(testcmd)-1] == '\n')
+                                       testcmd[strlen(testcmd)-1] = '\0';
+                               while (testcmd[strlen(testcmd)-1] == '\r')
+                                       testcmd[strlen(testcmd)-1] = '\0';
+                               while (testcmd[strlen(testcmd)-1] == ' ' || testcmd[strlen(testcmd)-1] == '\t')
+                                       testcmd[strlen(testcmd)-1] = '\0';
+                                       
+                               if (strstr(testcmd, "%s")) {
+                                       gchar *tmp = g_strdup_printf(testcmd, file_to_open);
+                                       gint res = system(tmp);
+                                       g_free(tmp);
+                                       g_free(orig_testcmd);
+                                       
+                                       if (res != 0) {
+                                               g_strfreev(parts);
+                                               continue;
+                                       }
+                               } else {
+                                       gint res = system(testcmd);
+                                       g_free(orig_testcmd);
+                                       
+                                       if (res != 0) {
+                                               g_strfreev(parts);
+                                               continue;
+                                       }
+                               }
+                       }
+                       
                        trimmed = parts[1];
-                       while (trimmed[0] == ' ')
+                       while (trimmed[0] == ' ' || trimmed[0] == '\t')
                                trimmed++;
-                       while (trimmed[strlen(trimmed)-1] == ' ')
-                               trimmed[strlen(trimmed)-1] = '\0';
                        while (trimmed[strlen(trimmed)-1] == '\n')
                                trimmed[strlen(trimmed)-1] = '\0';
                        while (trimmed[strlen(trimmed)-1] == '\r')
                                trimmed[strlen(trimmed)-1] = '\0';
+                       while (trimmed[strlen(trimmed)-1] == ' ' || trimmed[strlen(trimmed)-1] == '\t')
+                               trimmed[strlen(trimmed)-1] = '\0';
                        result = g_strdup(trimmed);
                        g_strfreev(parts);
                        fclose(fp);
-                       if (strstr(result, "%s") && !strstr(result, "'%s'")) {
+                       /* if there are no single quotes around %s, add them.
+                        * '.*%s.*' is ok, as in display 'png:%s'
+                        */
+                       if (strstr(result, "%s") 
+                       && !(strstr(result, "'") < strstr(result,"%s") &&
+                            strstr(strstr(result,"%s"), "'"))) {
                                gchar *start = g_strdup(result);
                                gchar *end = g_strdup(strstr(result, "%s")+2);
                                gchar *tmp;
@@ -4617,6 +4622,11 @@ static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type)
                                g_free(result);
                                result = tmp;
                        }
+                       if (needsterminal) {
+                               gchar *tmp = g_strdup_printf("xterm -e %s", result);
+                               g_free(result);
+                               result = tmp;
+                       }
                        return result;
                }
                g_strfreev(parts);
@@ -4624,19 +4634,62 @@ static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type)
        fclose(fp);
        return NULL;
 }
-gchar *mailcap_get_command_for_type(const gchar *type)
+gchar *mailcap_get_command_for_type(const gchar *type, const gchar *file_to_open)
 {
        gchar *result = NULL;
        gchar *path = NULL;
+       if (type == NULL)
+               return NULL;
        path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".mailcap", NULL);
-       result = mailcap_get_command_in_file(path, type);
+       result = mailcap_get_command_in_file(path, type, file_to_open);
        g_free(path);
        if (result)
                return result;
-       result = mailcap_get_command_in_file("/etc/mailcap", type);
+       result = mailcap_get_command_in_file("/etc/mailcap", type, file_to_open);
        return result;
 }
 
+void mailcap_update_default(const gchar *type, const gchar *command)
+{
+       gchar *path = NULL, *outpath = NULL;
+       path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".mailcap", NULL);
+       outpath = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".mailcap.new", NULL);
+       FILE *fp = fopen(path, "rb");
+       FILE *outfp = fopen(outpath, "wb");
+       gchar buf[BUFFSIZE];
+
+       if (!outfp) {
+               g_free(path);
+               g_free(outpath);
+               fclose(fp);
+               return;
+       }
+       while (fp && fgets(buf, sizeof (buf), fp) != NULL) {
+               gchar **parts = g_strsplit(buf, ";", 3);
+               gchar *trimmed = parts[0];
+               while (trimmed[0] == ' ')
+                       trimmed++;
+               while (trimmed[strlen(trimmed)-1] == ' ')
+                       trimmed[strlen(trimmed)-1] = '\0';
+
+               if (!strcmp(trimmed, type)) {
+                       g_strfreev(parts);
+                       continue;
+               }
+               else {
+                       fputs(buf, outfp);
+               }
+               g_strfreev(parts);
+       }
+       fprintf(outfp, "%s; %s\n", type, command);
+
+       if (fp)
+               fclose(fp);
+
+       fclose(outfp);
+       g_rename(outpath, path);
+}
+
 gint copy_dir(const gchar *src, const gchar *dst)
 {
        GDir *dir;
@@ -4657,14 +4710,30 @@ gint copy_dir(const gchar *src, const gchar *dst)
                debug_print("copying: %s -> %s\n", old_file, new_file);
                if (g_file_test(old_file, G_FILE_TEST_IS_REGULAR)) {
                        gint r = copy_file(old_file, new_file, TRUE);
-                       if (r < 0)
+                       if (r < 0) {
+                               g_dir_close(dir);
                                return r;
+                       }
+               } else if (g_file_test(old_file, G_FILE_TEST_IS_SYMLINK)) {
+                       GError *error;
+                       gint r = 0;
+                       gchar *target = g_file_read_link(old_file, &error);
+                       if (target)
+                               r = symlink(target, new_file);
+                       g_free(target);
+                       if (r < 0) {
+                               g_dir_close(dir);
+                               return r;
+                       }
                } else if (g_file_test(old_file, G_FILE_TEST_IS_DIR)) {
                        gint r = copy_dir(old_file, new_file);
-                       if (r < 0)
+                       if (r < 0) {
+                               g_dir_close(dir);
                                return r;
+                       }
                }
        }
+       g_dir_close(dir);
        return 0;
 }
 
@@ -4692,3 +4761,382 @@ gboolean file_is_email (const gchar *filename)
        fclose(fp);
        return (score >= 3);
 }
+
+gboolean sc_g_list_bigger(GList *list, gint max)
+{
+       GList *cur = list;
+       int i = 0;
+       while (cur && i <= max+1) {
+               i++;
+               cur = cur->next;
+       }
+       return (i > max);
+}
+
+gboolean sc_g_slist_bigger(GSList *list, gint max)
+{
+       GSList *cur = list;
+       int i = 0;
+       while (cur && i <= max+1) {
+               i++;
+               cur = cur->next;
+       }
+       return (i > max);
+}
+
+const gchar *daynames[] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL};
+const gchar *monthnames[] = {NULL, NULL, NULL, NULL, NULL, NULL, 
+                            NULL, NULL, NULL, NULL, NULL, NULL};
+const gchar *s_daynames[] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL};
+const gchar *s_monthnames[] = {NULL, NULL, NULL, NULL, NULL, NULL, 
+                            NULL, NULL, NULL, NULL, NULL, NULL};
+const gchar *s_am_up = NULL;
+const gchar *s_pm_up = NULL;
+const gchar *s_am_low = NULL;
+const gchar *s_pm_low = NULL;
+const gchar *def_loc_format = NULL;
+const gchar *date_loc_format = NULL;
+const gchar *time_loc_format = NULL;
+const gchar *time_am_pm = NULL;
+
+static gboolean time_names_init_done = FALSE;
+
+static void init_time_names(void)
+{
+       daynames[0] = Q_("Complete day name for use by strftime|Sunday");
+       daynames[1] = Q_("Complete day name for use by strftime|Monday");
+       daynames[2] = Q_("Complete day name for use by strftime|Tuesday");
+       daynames[3] = Q_("Complete day name for use by strftime|Wednesday");
+       daynames[4] = Q_("Complete day name for use by strftime|Thursday");
+       daynames[5] = Q_("Complete day name for use by strftime|Friday");
+       daynames[6] = Q_("Complete day name for use by strftime|Saturday");
+       
+       monthnames[0] = Q_("Complete month name for use by strftime|January");
+       monthnames[1] = Q_("Complete month name for use by strftime|February");
+       monthnames[2] = Q_("Complete month name for use by strftime|March");
+       monthnames[3] = Q_("Complete month name for use by strftime|April");
+       monthnames[4] = Q_("Complete month name for use by strftime|May");
+       monthnames[5] = Q_("Complete month name for use by strftime|June");
+       monthnames[6] = Q_("Complete month name for use by strftime|July");
+       monthnames[7] = Q_("Complete month name for use by strftime|August");
+       monthnames[8] = Q_("Complete month name for use by strftime|September");
+       monthnames[9] = Q_("Complete month name for use by strftime|October");
+       monthnames[10] = Q_("Complete month name for use by strftime|November");
+       monthnames[11] = Q_("Complete month name for use by strftime|December");
+
+       s_daynames[0] = Q_("Abbr. day name for use by strftime|Sun");
+       s_daynames[1] = Q_("Abbr. day name for use by strftime|Mon");
+       s_daynames[2] = Q_("Abbr. day name for use by strftime|Tue");
+       s_daynames[3] = Q_("Abbr. day name for use by strftime|Wed");
+       s_daynames[4] = Q_("Abbr. day name for use by strftime|Thu");
+       s_daynames[5] = Q_("Abbr. day name for use by strftime|Fri");
+       s_daynames[6] = Q_("Abbr. day name for use by strftime|Sat");
+       
+       s_monthnames[0] = Q_("Abbr. month name for use by strftime|Jan");
+       s_monthnames[1] = Q_("Abbr. month name for use by strftime|Feb");
+       s_monthnames[2] = Q_("Abbr. month name for use by strftime|Mar");
+       s_monthnames[3] = Q_("Abbr. month name for use by strftime|Apr");
+       s_monthnames[4] = Q_("Abbr. month name for use by strftime|May");
+       s_monthnames[5] = Q_("Abbr. month name for use by strftime|Jun");
+       s_monthnames[6] = Q_("Abbr. month name for use by strftime|Jul");
+       s_monthnames[7] = Q_("Abbr. month name for use by strftime|Aug");
+       s_monthnames[8] = Q_("Abbr. month name for use by strftime|Sep");
+       s_monthnames[9] = Q_("Abbr. month name for use by strftime|Oct");
+       s_monthnames[10] = Q_("Abbr. month name for use by strftime|Nov");
+       s_monthnames[11] = Q_("Abbr. month name for use by strftime|Dec");
+
+       s_am_up = Q_("For use by strftime (morning)|AM");
+       s_pm_up = Q_("For use by strftime (afternoon)|PM");
+       s_am_low = Q_("For use by strftime (morning, lowercase)|am");
+       s_pm_low = Q_("For use by strftime (afternoon, lowercase)|pm");
+       
+       def_loc_format = Q_("For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y");
+       date_loc_format = Q_("For use by strftime (default date format)|%m/%d/%y");
+       time_loc_format = Q_("For use by strftime (default time format)|%H:%M:%S");
+
+       time_am_pm = Q_("For use by strftime (default 12-hour time format)|%I:%M:%S %p");
+
+       time_names_init_done = TRUE;
+#if 0
+       {
+       struct tm *lt;
+       time_t now = time(NULL), next;
+       gchar buf_a[1024], buf_b[1024];
+       
+       printf("test strftime:\n");
+       tzset();
+       for (next = now; next < now + 86400*365*2; next++) {
+               lt = localtime(&now);
+               strftime(buf_a, 1024, 
+                       "%a,%A,%b,%B,%c,%C,%d,%D,%e,%F,%G,%g,%h,%H,%I "
+                       "%j,%k,%l,%m,%M,%n,%p,%P,%r,%R,%s,%S,%t,%T,%u,%U,%V"
+                       "%w,%W,%x,%X,%y,%Y,%z,%Z,%%,%EY,%OY", lt);
+               fast_strftime(buf_b, 1024, 
+                       "%a,%A,%b,%B,%c,%C,%d,%D,%e,%F,%G,%g,%h,%H,%I "
+                       "%j,%k,%l,%m,%M,%n,%p,%P,%r,%R,%s,%S,%t,%T,%u,%U,%V"
+                       "%w,%W,%x,%X,%y,%Y,%z,%Z,%%,%EY,%OY", lt);
+               if (strcmp(buf_a, buf_b)) {
+                       printf("diff: \n%s\n%s\n", buf_a, buf_b);
+               }
+       }
+       }
+#endif
+}
+
+#define CHECK_SIZE() {                 \
+       total_done += len;              \
+       if (total_done >= buflen) {     \
+               buf[buflen-1] = '\0';   \
+               return 0;               \
+       }                               \
+}
+
+size_t fast_strftime(gchar *buf, gint buflen, const gchar *format, struct tm *lt)
+{
+       gchar *curpos = buf;
+       gint total_done = 0;
+       gchar subbuf[64], subfmt[64];
+       static time_t last_tzset = (time_t)0;
+       
+       if (!time_names_init_done)
+               init_time_names();
+       
+       if (format == NULL || lt == NULL)
+               return 0;
+               
+       if (last_tzset != time(NULL)) {
+               tzset();
+               last_tzset = time(NULL);
+       }
+       while(*format) {
+               if (*format == '%') {
+                       gint len = 0, tmp = 0;
+                       format++;
+                       switch(*format) {
+                       case '%':
+                               len = 1; CHECK_SIZE();
+                               *curpos = '%';
+                               break;
+                       case 'a':
+                               len = strlen(s_daynames[lt->tm_wday]); CHECK_SIZE();
+                               strncpy2(curpos, s_daynames[lt->tm_wday], buflen - total_done);
+                               break;
+                       case 'A':
+                               len = strlen(daynames[lt->tm_wday]); CHECK_SIZE();
+                               strncpy2(curpos, daynames[lt->tm_wday], buflen - total_done);
+                               break;
+                       case 'b':
+                       case 'h':
+                               len = strlen(s_monthnames[lt->tm_mon]); CHECK_SIZE();
+                               strncpy2(curpos, s_monthnames[lt->tm_mon], buflen - total_done);
+                               break;
+                       case 'B':
+                               len = strlen(monthnames[lt->tm_mon]); CHECK_SIZE();
+                               strncpy2(curpos, monthnames[lt->tm_mon], buflen - total_done);
+                               break;
+                       case 'c':
+                               fast_strftime(subbuf, 64, def_loc_format, lt);
+                               len = strlen(subbuf); CHECK_SIZE();
+                               strncpy2(curpos, subbuf, buflen - total_done);
+                               break;
+                       case 'C':
+                               total_done += 2; CHECK_SIZE();
+                               tmp = (lt->tm_year + 1900)/100;
+                               *curpos++ = '0'+(tmp / 10);
+                               *curpos++ = '0'+(tmp % 10);
+                               break;
+                       case 'd':
+                               total_done += 2; CHECK_SIZE();
+                               *curpos++ = '0'+(lt->tm_mday / 10);
+                               *curpos++ = '0'+(lt->tm_mday % 10);
+                               break;
+                       case 'D':
+                               total_done += 8; CHECK_SIZE();
+                               *curpos++ = '0'+((lt->tm_mon+1) / 10);
+                               *curpos++ = '0'+((lt->tm_mon+1) % 10);
+                               *curpos++ = '/';
+                               *curpos++ = '0'+(lt->tm_mday / 10);
+                               *curpos++ = '0'+(lt->tm_mday % 10);
+                               *curpos++ = '/';
+                               tmp = lt->tm_year%100;
+                               *curpos++ = '0'+(tmp / 10);
+                               *curpos++ = '0'+(tmp % 10);
+                               break;
+                       case 'e':
+                               len = 2; CHECK_SIZE();
+                               snprintf(curpos, buflen - total_done, "%2d", lt->tm_mday);
+                               break;
+                       case 'F':
+                               len = 10; CHECK_SIZE();
+                               snprintf(curpos, buflen - total_done, "%4d-%02d-%02d", 
+                                       lt->tm_year + 1900, lt->tm_mon +1, lt->tm_mday);
+                               break;
+                       case 'H':
+                               total_done += 2; CHECK_SIZE();
+                               *curpos++ = '0'+(lt->tm_hour / 10);
+                               *curpos++ = '0'+(lt->tm_hour % 10);
+                               break;
+                       case 'I':
+                               total_done += 2; CHECK_SIZE();
+                               tmp = lt->tm_hour;
+                               if (tmp > 12)
+                                       tmp -= 12;
+                               else if (tmp == 0)
+                                       tmp = 12;
+                               *curpos++ = '0'+(tmp / 10);
+                               *curpos++ = '0'+(tmp % 10);
+                               break;
+                       case 'j':
+                               len = 3; CHECK_SIZE();
+                               snprintf(curpos, buflen - total_done, "%03d", lt->tm_yday+1);
+                               break;
+                       case 'k':
+                               len = 2; CHECK_SIZE();
+                               snprintf(curpos, buflen - total_done, "%2d", lt->tm_hour);
+                               break;
+                       case 'l':
+                               len = 2; CHECK_SIZE();
+                               tmp = lt->tm_hour;
+                               if (tmp > 12)
+                                       tmp -= 12;
+                               else if (tmp == 0)
+                                       tmp = 12;
+                               snprintf(curpos, buflen - total_done, "%2d", tmp);
+                               break;
+                       case 'm':
+                               total_done += 2; CHECK_SIZE();
+                               tmp = lt->tm_mon + 1;
+                               *curpos++ = '0'+(tmp / 10);
+                               *curpos++ = '0'+(tmp % 10);
+                               break;
+                       case 'M':
+                               total_done += 2; CHECK_SIZE();
+                               *curpos++ = '0'+(lt->tm_min / 10);
+                               *curpos++ = '0'+(lt->tm_min % 10);
+                               break;
+                       case 'n':
+                               len = 1; CHECK_SIZE();
+                               *curpos = '\n';
+                               break;
+                       case 'p':
+                               if (lt->tm_hour >= 12) {
+                                       len = strlen(s_pm_up); CHECK_SIZE();
+                                       snprintf(curpos, buflen-total_done, s_pm_up);
+                               } else {
+                                       len = strlen(s_am_up); CHECK_SIZE();
+                                       snprintf(curpos, buflen-total_done, s_am_up);
+                               }
+                               break;
+                       case 'P':
+                               if (lt->tm_hour >= 12) {
+                                       len = strlen(s_pm_low); CHECK_SIZE();
+                                       snprintf(curpos, buflen-total_done, s_pm_low);
+                               } else {
+                                       len = strlen(s_am_low); CHECK_SIZE();
+                                       snprintf(curpos, buflen-total_done, s_am_low);
+                               }
+                               break;
+                       case 'r':
+                               fast_strftime(subbuf, 64, time_am_pm, lt);
+                               len = strlen(subbuf); CHECK_SIZE();
+                               strncpy2(curpos, subbuf, buflen - total_done);
+                               break;
+                       case 'R':
+                               total_done += 5; CHECK_SIZE();
+                               *curpos++ = '0'+(lt->tm_hour / 10);
+                               *curpos++ = '0'+(lt->tm_hour % 10);
+                               *curpos++ = ':';
+                               *curpos++ = '0'+(lt->tm_min / 10);
+                               *curpos++ = '0'+(lt->tm_min % 10);
+                               break;
+                       case 's':
+                               snprintf(subbuf, buflen - total_done, "%ld", mktime(lt));
+                               len = strlen(subbuf); CHECK_SIZE();
+                               strncpy2(curpos, subbuf, buflen - total_done);
+                               break;
+                       case 'S':
+                               total_done += 2; CHECK_SIZE();
+                               *curpos++ = '0'+(lt->tm_sec / 10);
+                               *curpos++ = '0'+(lt->tm_sec % 10);
+                               break;
+                       case 't':
+                               len = 1; CHECK_SIZE();
+                               *curpos = '\t';
+                               break;
+                       case 'T':
+                               total_done += 8; CHECK_SIZE();
+                               *curpos++ = '0'+(lt->tm_hour / 10);
+                               *curpos++ = '0'+(lt->tm_hour % 10);
+                               *curpos++ = ':';
+                               *curpos++ = '0'+(lt->tm_min / 10);
+                               *curpos++ = '0'+(lt->tm_min % 10);
+                               *curpos++ = ':';
+                               *curpos++ = '0'+(lt->tm_sec / 10);
+                               *curpos++ = '0'+(lt->tm_sec % 10);
+                               break;
+                       case 'u':
+                               len = 1; CHECK_SIZE();
+                               snprintf(curpos, buflen - total_done, "%d", lt->tm_wday == 0 ? 7: lt->tm_wday);
+                               break;
+                       case 'w':
+                               len = 1; CHECK_SIZE();
+                               snprintf(curpos, buflen - total_done, "%d", lt->tm_wday);
+                               break;
+                       case 'x':
+                               fast_strftime(subbuf, 64, date_loc_format, lt);
+                               len = strlen(subbuf); CHECK_SIZE();
+                               strncpy2(curpos, subbuf, buflen - total_done);
+                               break;
+                       case 'X':
+                               fast_strftime(subbuf, 64, time_loc_format, lt);
+                               len = strlen(subbuf); CHECK_SIZE();
+                               strncpy2(curpos, subbuf, buflen - total_done);
+                               break;
+                       case 'y':
+                               total_done += 2; CHECK_SIZE();
+                               tmp = lt->tm_year%100;
+                               *curpos++ = '0'+(tmp / 10);
+                               *curpos++ = '0'+(tmp % 10);
+                               break;
+                       case 'Y':
+                               len = 4; CHECK_SIZE();
+                               snprintf(curpos, buflen - total_done, "%4d", lt->tm_year + 1900);
+                               break;
+                       case 'G':
+                       case 'g':
+                       case 'U':
+                       case 'V':
+                       case 'W':
+                       case 'z':
+                       case 'Z':
+                       case '+':
+                               /* let these complicated ones be done with the libc */
+                               snprintf(subfmt, 64, "%%%c", *format);
+                               strftime(subbuf, 64, subfmt, lt);
+                               len = strlen(subbuf); CHECK_SIZE();
+                               strncpy2(curpos, subbuf, buflen - total_done);
+                               break;
+                       case 'E':
+                       case 'O':
+                               /* let these complicated modifiers be done with the libc */
+                               snprintf(subfmt, 64, "%%%c%c", *format, *(format+1));
+                               strftime(subbuf, 64, subfmt, lt);
+                               len = strlen(subbuf); CHECK_SIZE();
+                               strncpy2(curpos, subbuf, buflen - total_done);
+                               format++;
+                               break;
+                       default:
+                               g_warning("format error (%c)", *format);
+                               *curpos = '\0';
+                               return total_done;
+                       }
+                       curpos += len;
+                       format++;
+               } else {
+                       int len = 1; CHECK_SIZE();
+                       *curpos++ = *format++; 
+               }
+       }
+       *curpos++ = '\0';
+       return total_done;
+}