2007-11-16 [wwp] 3.0.2cvs141
[claws.git] / src / common / utils.c
index fb26796346352c4e1c1c721e0c8df4bb699f3cfb..f49f1f1ca16cc79107dece355c63fae71b3913a3 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
 #include "defs.h"
 
 #include <glib.h>
+
 #include <glib/gi18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
+#include <sys/param.h>
 
 #if (HAVE_WCTYPE_H && HAVE_WCHAR_H)
 #  include <wchar.h>
 #include <dirent.h>
 #include <time.h>
 #include <regex.h>
+
+#ifdef G_OS_UNIX
 #include <sys/utsname.h>
+#endif
 
 #ifdef G_OS_WIN32
 #  include <direct.h>
 #  include <io.h>
+#  include <fcntl.h>
+#  include <w32lib.h>
+#endif
+
+#ifdef MAEMO
+#include <libosso.h>
+#ifdef CHINOOK
+# include <tablet-browser-interface.h>
+#else
+# include <osso-browser-interface.h>
+#endif
 #endif
 
 #include "utils.h"
 #define BUFFSIZE       8192
 
 static gboolean debug_mode = FALSE;
+#ifdef G_OS_WIN32
+static GSList *tempfiles=NULL;
+#endif
+
+/* Return true if we are running as root.  This function should beused
+   instead of getuid () == 0.  */
+gboolean superuser_p (void)
+{
+#ifdef G_OS_WIN32
+  return w32_is_administrator ();
+#else
+  return !getuid();
+#endif  
+}
+
 
 
 #if !GLIB_CHECK_VERSION(2, 7, 0) && !defined(G_OS_UNIX)
@@ -153,6 +185,38 @@ gint g_chmod(const gchar *path, gint mode)
 }
 #endif /* GLIB_CHECK_VERSION && G_OS_UNIX */
 
+
+#ifdef G_OS_WIN32
+gint mkstemp_name(const gchar *template, gchar **name_used)
+{
+       static gulong count=0; /* W32-_mktemp only supports up to 27
+                                 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));
+
+       tempfiles=g_slist_append(tempfiles, g_strdup(*name_used));
+       if (tmpfd<0) {
+               perror(g_strdup_printf("cant create %s",*name_used));
+               return -1;
+       }
+       else
+               return tmpfd;
+}
+#endif /* G_OS_WIN32 */
+
+#ifdef G_OS_WIN32
+gint mkstemp(const gchar *template)
+{
+       gchar *dummyname;
+       gint res = mkstemp_name(template, &dummyname);
+       g_free(dummyname);
+       return res;
+}
+#endif /* G_OS_WIN32 */
+
 void list_free_strings(GList *list)
 {
        list = g_list_first(list);
@@ -171,24 +235,6 @@ void slist_free_strings(GSList *list)
        }
 }
 
-GSList *slist_concat_unique (GSList *first, GSList *second)
-{
-       GSList *tmp, *ret;
-       if (first == NULL) {
-               if (second == NULL)
-                       return NULL;
-               else 
-                       return second;
-       } else if (second == NULL)
-               return first;
-       ret = first;
-       for (tmp = second; tmp != NULL; tmp = g_slist_next(tmp)) {
-               if (g_slist_find(ret, tmp->data) == NULL)
-                       ret = g_slist_prepend(ret, tmp->data);
-       }
-       return ret;
-}
 static void hash_free_strings_func(gpointer key, gpointer value, gpointer data)
 {
        g_free(key);
@@ -199,17 +245,6 @@ void hash_free_strings(GHashTable *table)
        g_hash_table_foreach(table, hash_free_strings_func, NULL);
 }
 
-static void hash_free_value_mem_func(gpointer key, gpointer value,
-                                    gpointer data)
-{
-       g_free(value);
-}
-
-void hash_free_value_mem(GHashTable *table)
-{
-       g_hash_table_foreach(table, hash_free_value_mem_func, NULL);
-}
-
 gint str_case_equal(gconstpointer v, gconstpointer v2)
 {
        return g_ascii_strcasecmp((const gchar *)v, (const gchar *)v2) == 0;
@@ -252,16 +287,6 @@ gboolean str_case_find(const gchar *haystack, const gchar *needle)
        return strcasestr(haystack, needle) != NULL ? TRUE : FALSE;
 }
 
-gboolean str_find_equal(const gchar *haystack, const gchar *needle)
-{
-       return strcmp(haystack, needle) == 0;
-}
-
-gboolean str_case_find_equal(const gchar *haystack, const gchar *needle)
-{
-       return g_ascii_strcasecmp(haystack, needle) == 0;
-}
-
 gint to_number(const gchar *nstr)
 {
        register const gchar *p;
@@ -290,20 +315,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 */
@@ -326,17 +372,35 @@ gchar *strstr2(const gchar *s1, const gchar *s2)
 gint path_cmp(const gchar *s1, const gchar *s2)
 {
        gint len1, len2;
+       int rc;
+#ifdef G_OS_WIN32
+       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;
+#endif /* !G_OS_WIN32 */
+
        len1 = strlen(s1);
        len2 = strlen(s2);
 
        if (s1[len1 - 1] == G_DIR_SEPARATOR) len1--;
        if (s2[len2 - 1] == G_DIR_SEPARATOR) len2--;
 
-       return strncmp(s1, s2, MAX(len1, len2));
+       rc = strncmp(s1, s2, MAX(len1, len2));
+#ifdef G_OS_WIN32
+       g_free (s1buf);
+       g_free (s2buf);
+#endif /* !G_OS_WIN32 */
+       return rc;
 }
 
 /* remove trailing return code */
@@ -384,14 +448,14 @@ gchar *strcrchomp(gchar *str)
        return str;
 }
 
-void file_strip_crs(const gchar *file) 
+gint file_strip_crs(const gchar *file)
 {
        FILE *fp = NULL, *outfp = NULL;
        gchar buf[4096];
        gchar *out = get_tmp_file();
        if (file == NULL)
                goto freeout;
-       
+
        fp = fopen(file, "rb");
        if (!fp)
                goto freeout;
@@ -404,14 +468,27 @@ void file_strip_crs(const gchar *file)
 
        while (fgets(buf, sizeof (buf), fp) != NULL) {
                strcrchomp(buf);
-               fputs(buf, outfp);
+               if (fputs(buf, outfp) == EOF) {
+                       fclose(fp);
+                       fclose(outfp);
+                       goto unlinkout;
+               }
        }
-       
+
        fclose(fp);
-       fclose(outfp);
-       rename_force(out, file);
+       if (fclose(outfp) == EOF) {
+               goto unlinkout;
+       }
+       
+       if (rename_force(out, file) < 0)
+               goto unlinkout;
+       
+       return 0;
+unlinkout:
+       g_unlink(out);
 freeout:
        g_free(out);
+       return -1;
 }
 
 /* Similar to `strstr' but this function ignores the case of both strings.  */
@@ -473,210 +550,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)
@@ -704,6 +577,30 @@ gint get_next_word_len(const gchar *s)
        return len;
 }
 
+static void trim_subject_for_compare(gchar *str)
+{
+       gchar *srcp;
+
+       eliminate_parenthesis(str, '[', ']');
+       eliminate_parenthesis(str, '(', ')');
+       g_strstrip(str);
+
+       srcp = str + subject_get_prefix_length(str);
+       if (srcp != str)
+               memmove(str, srcp, strlen(srcp) + 1);
+}
+
+static void trim_subject_for_sort(gchar *str)
+{
+       gchar *srcp;
+
+       g_strstrip(str);
+
+       srcp = str + subject_get_prefix_length(str);
+       if (srcp != str)
+               memmove(str, srcp, strlen(srcp) + 1);
+}
+
 /* compare subjects */
 gint subject_compare(const gchar *s1, const gchar *s2)
 {
@@ -738,36 +635,12 @@ gint subject_compare_for_sort(const gchar *s1, const gchar *s2)
        return g_utf8_collate(str1, str2);
 }
 
-void trim_subject_for_compare(gchar *str)
-{
-       gchar *srcp;
-
-       eliminate_parenthesis(str, '[', ']');
-       eliminate_parenthesis(str, '(', ')');
-       g_strstrip(str);
-
-       srcp = str + subject_get_prefix_length(str);
-       if (srcp != str)
-               memmove(str, srcp, strlen(srcp) + 1);
-}
-
-void trim_subject_for_sort(gchar *str)
-{
-       gchar *srcp;
-
-       g_strstrip(str);
-
-       srcp = str + subject_get_prefix_length(str);
-       if (srcp != str)        
-               memmove(str, srcp, strlen(srcp) + 1);
-}
-
 void trim_subject(gchar *str)
 {
        register gchar *srcp;
        gchar op, cl;
        gint in_brace;
-       
+
        g_strstrip(str);
 
        srcp = str + subject_get_prefix_length(str);
@@ -849,7 +722,7 @@ void extract_parenthesis(gchar *str, gchar op, gchar cl)
        *destp = '\0';
 }
 
-void extract_parenthesis_with_skip_quote(gchar *str, gchar quote_chr,
+static void extract_parenthesis_with_skip_quote(gchar *str, gchar quote_chr,
                                         gchar op, gchar cl)
 {
        register gchar *srcp, *destp;
@@ -880,24 +753,6 @@ void extract_parenthesis_with_skip_quote(gchar *str, gchar quote_chr,
        *destp = '\0';
 }
 
-void eliminate_quote(gchar *str, gchar quote_chr)
-{
-       register gchar *srcp, *destp;
-
-       srcp = destp = str;
-
-       while ((destp = strchr(destp, quote_chr))) {
-               if ((srcp = strchr(destp + 1, quote_chr))) {
-                       srcp++;
-                       while (g_ascii_isspace(*srcp)) srcp++;
-                       memmove(destp, srcp, strlen(srcp) + 1);
-               } else {
-                       *destp = '\0';
-                       break;
-               }
-       }
-}
-
 void extract_quote(gchar *str, gchar quote_chr)
 {
        register gchar *p;
@@ -971,23 +826,6 @@ gchar *strchr_with_skip_quote(const gchar *str, gint quote_chr, gint c)
        return NULL;
 }
 
-gchar *strrchr_with_skip_quote(const gchar *str, gint quote_chr, gint c)
-{
-       gboolean in_quote = FALSE;
-       const gchar *p;
-
-       p = str + strlen(str) - 1;
-       while (p >= str) {
-               if (*p == c && !in_quote)
-                       return (gchar *)p;
-               if (*p == quote_chr)
-                       in_quote ^= TRUE;
-               p--;
-       }
-
-       return NULL;
-}
-
 void extract_address(gchar *str)
 {
        eliminate_address_comment(str);
@@ -1137,7 +975,7 @@ GList *add_history(GList *list, const gchar *str)
                last = g_list_last(list);
                if (last) {
                        g_free(last->data);
-                       g_list_remove(list, last->data);
+                       list = g_list_remove(list, last->data);
                }
        }
 
@@ -1203,7 +1041,7 @@ void subst_char(gchar *str, gchar orig, gchar subst)
        }
 }
 
-void subst_chars(gchar *str, gchar *orig, gchar subst)
+static void subst_chars(gchar *str, gchar *orig, gchar subst)
 {
        register gchar *p = str;
 
@@ -1218,7 +1056,11 @@ void subst_for_filename(gchar *str)
 {
        if (!str)
                return;
+#ifdef G_OS_WIN32
+       subst_chars(str, "\t\r\n\\/*:", '_');
+#else
        subst_chars(str, "\t\r\n\\/*", '_');
+#endif
 }
 
 void subst_for_shellsafe_filename(gchar *str)
@@ -1229,19 +1071,6 @@ void subst_for_shellsafe_filename(gchar *str)
        subst_chars(str, " \"'|&;()<>'!{}[]",'_');
 }
 
-gboolean is_header_line(const gchar *str)
-{
-       if (str[0] == ':') return FALSE;
-
-       while (*str != '\0' && *str != ' ') {
-               if (*str == ':')
-                       return TRUE;
-               str++;
-       }
-
-       return FALSE;
-}
-
 gboolean is_ascii_str(const gchar *str)
 {
        const guchar *p = (const guchar *)str;
@@ -1257,6 +1086,24 @@ gboolean is_ascii_str(const gchar *str)
        return TRUE;
 }
 
+static const gchar * line_has_quote_char_last(const gchar * str, const gchar *quote_chars)
+{
+       gchar * position = NULL;
+       gchar * tmp_pos = NULL;
+       int i;
+
+       if (quote_chars == NULL)
+               return FALSE;
+
+       for (i = 0; i < strlen(quote_chars); i++) {
+               tmp_pos = strrchr (str, quote_chars[i]);
+               if(position == NULL
+                  || (tmp_pos != NULL && position <= tmp_pos) )
+                       position = tmp_pos;
+       }
+       return position;
+}
+
 gint get_quote_level(const gchar *str, const gchar *quote_chars)
 {
        const gchar *first_pos;
@@ -1285,9 +1132,9 @@ gint get_quote_level(const gchar *str, const gchar *quote_chars)
                        quote_level++;
                else if (*p != '-' && !g_ascii_isspace(*p) && p <= last_pos) {
                        /* any characters are allowed except '-' and space */
-                       while (*p != '-' 
-                              && !strchr(quote_chars, *p) 
-                              && !g_ascii_isspace(*p) 
+                       while (*p != '-'
+                              && !strchr(quote_chars, *p)
+                              && !g_ascii_isspace(*p)
                               && p < last_pos)
                                p++;
                        if (strchr(quote_chars, *p))
@@ -1328,7 +1175,7 @@ gint check_line_length(const gchar *str, gint max_chars, gint *line)
        return 0;
 }
 
-const gchar * line_has_quote_char(const gchar * str, const gchar *quote_chars) 
+const gchar * line_has_quote_char(const gchar * str, const gchar *quote_chars)
 {
        gchar * position = NULL;
        gchar * tmp_pos = NULL;
@@ -1336,35 +1183,17 @@ const gchar * line_has_quote_char(const gchar * str, const gchar *quote_chars)
 
        if (quote_chars == NULL)
                return FALSE;
-       
+
        for (i = 0; i < strlen(quote_chars); i++) {
                tmp_pos = strchr (str,  quote_chars[i]);
-               if(position == NULL 
+               if(position == NULL
                   || (tmp_pos != NULL && position >= tmp_pos) )
                        position = tmp_pos;
        }
-       return position; 
+       return position;
 }
 
-const gchar * line_has_quote_char_last(const gchar * str, const gchar *quote_chars) 
-{
-       gchar * position = NULL;
-       gchar * tmp_pos = NULL;
-       int i;
-
-       if (quote_chars == NULL)
-               return FALSE;
-       
-       for (i = 0; i < strlen(quote_chars); i++) {
-               tmp_pos = strrchr (str, quote_chars[i]);
-               if(position == NULL 
-                  || (tmp_pos != NULL && position <= tmp_pos) )
-                       position = tmp_pos;
-       }
-       return position; 
-}
-
-gchar *strstr_with_skip_quote(const gchar *haystack, const gchar *needle)
+static gchar *strstr_with_skip_quote(const gchar *haystack, const gchar *needle)
 {
        register guint haystack_len, needle_len;
        gboolean in_squote = FALSE, in_dquote = FALSE;
@@ -1401,94 +1230,6 @@ gchar *strstr_with_skip_quote(const gchar *haystack, const gchar *needle)
        return NULL;
 }
 
-gchar *strchr_parenthesis_close(const gchar *str, gchar op, gchar cl)
-{
-       const gchar *p;
-       gchar quote_chr = '"';
-       gint in_brace;
-       gboolean in_quote = FALSE;
-
-       p = str;
-
-       if ((p = strchr_with_skip_quote(p, quote_chr, op))) {
-               p++;
-               in_brace = 1;
-               while (*p) {
-                       if (*p == op && !in_quote)
-                               in_brace++;
-                       else if (*p == cl && !in_quote)
-                               in_brace--;
-                       else if (*p == quote_chr)
-                               in_quote ^= TRUE;
-
-                       if (in_brace == 0)
-                               return (gchar *)p;
-
-                       p++;
-               }
-       }
-
-       return NULL;
-}
-
-gchar **strsplit_parenthesis(const gchar *str, gchar op, gchar cl,
-                            gint max_tokens)
-{
-       GSList *string_list = NULL, *slist;
-       gchar **str_array;
-       const gchar *s_op, *s_cl;
-       guint i, n = 1;
-
-       g_return_val_if_fail(str != NULL, NULL);
-
-       if (max_tokens < 1)
-               max_tokens = G_MAXINT;
-
-       s_op = strchr_with_skip_quote(str, '"', op);
-       if (!s_op) return NULL;
-       str = s_op;
-       s_cl = strchr_parenthesis_close(str, op, cl);
-       if (s_cl) {
-               do {
-                       guint len;
-                       gchar *new_string;
-
-                       str++;
-                       len = s_cl - str;
-                       new_string = g_new(gchar, len + 1);
-                       strncpy(new_string, str, len);
-                       new_string[len] = 0;
-                       string_list = g_slist_prepend(string_list, new_string);
-                       n++;
-                       str = s_cl + 1;
-
-                       while (*str && g_ascii_isspace(*str)) str++;
-                       if (*str != op) {
-                               string_list = g_slist_prepend(string_list,
-                                                             g_strdup(""));
-                               n++;
-                               s_op = strchr_with_skip_quote(str, '"', op);
-                               if (!--max_tokens || !s_op) break;
-                               str = s_op;
-                       } else
-                               s_op = str;
-                       s_cl = strchr_parenthesis_close(str, op, cl);
-               } while (--max_tokens && s_cl);
-       }
-
-       str_array = g_new(gchar*, n);
-
-       i = n - 1;
-
-       str_array[i--] = NULL;
-       for (slist = string_list; slist; slist = slist->next)
-               str_array[i--] = slist->data;
-
-       g_slist_free(string_list);
-
-       return str_array;
-}
-
 gchar **strsplit_with_quote(const gchar *str, const gchar *delim,
                            gint max_tokens)
 {
@@ -1634,7 +1375,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.
                     */
@@ -1657,13 +1398,13 @@ GList *uri_list_extract_filenames(const gchar *uri_list)
        return result;
 }
 
-/* Converts two-digit hexadecimal to decimal.  Used for unescaping escaped 
+/* Converts two-digit hexadecimal to decimal.  Used for unescaping escaped
  * characters
  */
 static gint axtoi(const gchar *hexstr)
 {
        gint hi, lo, result;
-       
+
        hi = hexstr[0];
        if ('0' <= hi && hi <= '9') {
                hi -= '0';
@@ -1691,6 +1432,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 ||
@@ -1699,6 +1442,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)
@@ -1727,7 +1472,7 @@ gint get_uri_len(const gchar *str)
 /* Decodes URL-Encoded strings (i.e. strings in which spaces are replaced by
  * plusses, and escape characters are used)
  */
-void decode_uri(gchar *decoded_uri, const gchar *encoded_uri)
+void decode_uri_with_plus(gchar *decoded_uri, const gchar *encoded_uri, gboolean with_plus)
 {
        gchar *dec = decoded_uri;
        const gchar *enc = encoded_uri;
@@ -1742,7 +1487,7 @@ void decode_uri(gchar *decoded_uri, const gchar *encoded_uri)
                                enc += 2;
                        }
                } else {
-                       if (*enc == '+')
+                       if (with_plus && *enc == '+')
                                *dec = ' ';
                        else
                                *dec = *enc;
@@ -1754,11 +1499,29 @@ void decode_uri(gchar *decoded_uri, const gchar *encoded_uri)
        *dec = '\0';
 }
 
+void decode_uri(gchar *decoded_uri, const gchar *encoded_uri)
+{
+       decode_uri_with_plus(decoded_uri, encoded_uri, TRUE);
+}
+
+static gchar *decode_uri_gdup(const gchar *encoded_uri)
+{
+    gchar *buffer = g_malloc(strlen(encoded_uri)+1);
+    decode_uri(buffer, encoded_uri);
+    return buffer;
+}
+
 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 };
+       gint num_attach = 0;
+       gchar **my_att = NULL;
 
        Xstrdup_a(tmp_mailto, mailto, return -1);
 
@@ -1772,7 +1535,10 @@ gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
        }
 
        if (to && !*to)
-               *to = g_strdup(tmp_mailto);
+               *to = decode_uri_gdup(tmp_mailto);
+
+       my_att = g_malloc(sizeof(char *));
+       my_att[0] = NULL;
 
        while (p) {
                gchar *field, *value;
@@ -1794,55 +1560,265 @@ gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
 
                if (*value == '\0') continue;
 
-               if (cc && !*cc && !g_ascii_strcasecmp(field, "cc")) {
-                       *cc = g_strdup(value);
-               } else if (bcc && !*bcc && !g_ascii_strcasecmp(field, "bcc")) {
-                       *bcc = g_strdup(value);
+               if (cc && !g_ascii_strcasecmp(field, "cc")) {
+                       if (!*cc) {
+                               *cc = decode_uri_gdup(value);
+                       } else {
+                               gchar *tmp = decode_uri_gdup(value);
+                               gchar *new_cc = g_strdup_printf("%s, %s", *cc, tmp);
+                               g_free(*cc);
+                               *cc = new_cc;
+                       }
+               } else if (bcc && !g_ascii_strcasecmp(field, "bcc")) {
+                       if (!*bcc) {
+                               *bcc = decode_uri_gdup(value);
+                       } else {
+                               gchar *tmp = decode_uri_gdup(value);
+                               gchar *new_bcc = g_strdup_printf("%s, %s", *bcc, tmp);
+                               g_free(*bcc);
+                               *bcc = new_bcc;
+                       }
                } else if (subject && !*subject &&
                           !g_ascii_strcasecmp(field, "subject")) {
-                       *subject = g_malloc(strlen(value) + 1);
-                       decode_uri(*subject, value);
+                       *subject = decode_uri_gdup(value);
                } else if (body && !*body && !g_ascii_strcasecmp(field, "body")) {
-                       *body = g_malloc(strlen(value) + 1);
-                       decode_uri(*body, value);
+                       *body = decode_uri_gdup(value);
+               } else if (attach && !g_ascii_strcasecmp(field, "attach")) {
+                       int i = 0;
+                       gchar *tmp = decode_uri_gdup(value);
+                       for (; forbidden_uris[i]; i++) {
+                               if (strstr(tmp, forbidden_uris[i])) {
+                                       g_print("Refusing to attach '%s', potential private data leak\n",
+                                                       tmp);
+                                       g_free(tmp);
+                                       tmp = NULL;
+                                       break;
+                               }
+                       }
+                       if (tmp) {
+                               /* attach is correct */
+                               num_attach++;
+                               printf("realloc my_att %d\n", (num_attach+1));
+                               my_att = g_realloc(my_att, (sizeof(char *))*(num_attach+1));
+                               my_att[num_attach-1] = tmp;
+                               my_att[num_attach] = NULL;
+                       }
                }
        }
 
+       if (attach)
+               *attach = my_att;
        return 0;
 }
 
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#ifndef CSIDL_APPDATA
+#define CSIDL_APPDATA 0x001a
+#endif
+#ifndef CSIDL_LOCAL_APPDATA
+#define CSIDL_LOCAL_APPDATA 0x001c
+#endif
+#ifndef CSIDL_FLAG_CREATE
+#define CSIDL_FLAG_CREATE 0x8000
+#endif
+#define DIM(v)              (sizeof(v)/sizeof((v)[0]))
+
+#define RTLD_LAZY 0
+const char *
+w32_strerror (int w32_errno)
+{
+  static char strerr[256];
+  int ec = (int)GetLastError ();
+
+  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);
+  return strerr;
+}
+
+static __inline__ void *
+dlopen (const char * name, int flag)
+{
+  void * hd = LoadLibrary (name);
+  return hd;
+}
+
+static __inline__ void *
+dlsym (void * hd, const char * sym)
+{
+  if (hd && sym)
+    {
+      void * fnc = GetProcAddress (hd, sym);
+      if (!fnc)
+       return NULL;
+      return fnc;
+    }
+  return NULL;
+}
+
+
+static __inline__ const char *
+dlerror (void)
+{
+  return w32_strerror (0);
+}
+
+
+static __inline__ int
+dlclose (void * hd)
+{
+  if (hd)
+    {
+      FreeLibrary (hd);
+      return 0;
+    }
+  return -1;
+}
+
+static HRESULT
+w32_shgetfolderpath (HWND a, int b, HANDLE c, DWORD d, LPSTR e)
+{
+  static int initialized;
+  static HRESULT (WINAPI * func)(HWND,int,HANDLE,DWORD,LPSTR);
+
+  if (!initialized)
+    {
+      static char *dllnames[] = { "shell32.dll", "shfolder.dll", NULL };
+      void *handle;
+      int i;
+
+      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;
+               }
+           }
+       }
+    }
+
+  if (func)
+    return func (a,b,c,d,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 const gchar *home_dir = NULL;
+       static char home_dir[MAX_PATH] = "";
 
-       if (!home_dir) {
-               home_dir = g_get_home_dir();
-               if (!home_dir)
-                       home_dir = "C:\\Sylpheed";
+       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
 }
 
+static gchar *claws_rc_dir = NULL;
+static gboolean rc_dir_alt = FALSE;
 const gchar *get_rc_dir(void)
 {
-       static gchar *rc_dir = NULL;
 
-       if (!rc_dir)
-#ifdef G_OS_WIN32
-               rc_dir = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
-                                    "Application Data", G_DIR_SEPARATOR_S,
+       if (!claws_rc_dir)
+               claws_rc_dir = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
                                     RC_DIR, NULL);
-#else
-               rc_dir = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
-                                    RC_DIR, NULL);
-#endif
 
-       return rc_dir;
+       return claws_rc_dir;
+}
+
+void set_rc_dir(const gchar *dir)
+{
+       if (claws_rc_dir != NULL) {
+               g_print("Error: rc_dir already set\n");
+       } else {
+               rc_dir_alt = TRUE;
+               if (g_path_is_absolute(dir))
+                       claws_rc_dir = g_strdup(dir);
+               else {
+                       claws_rc_dir = g_strconcat(g_get_current_dir(),
+                               G_DIR_SEPARATOR_S, dir, NULL);
+               }
+               debug_print("set rc_dir to %s\n", claws_rc_dir);
+               if (!is_dir_exist(claws_rc_dir)) {
+                       if (make_dir_hier(claws_rc_dir) != 0) {
+                               g_print("Error: can't create %s\n",
+                               claws_rc_dir);
+                       }
+               }
+       }
+}
+
+gboolean rc_dir_is_alt(void) {
+       return rc_dir_alt;
 }
 
 const gchar *get_mail_base_dir(void)
@@ -1860,39 +1836,81 @@ const gchar *get_mail_base_dir(void)
 #endif
 }
 
+#ifdef MAEMO
+const gchar *prefs_common_get_data_root(void);
+gchar *last_data_root = NULL;
+#endif
+
 const gchar *get_news_cache_dir(void)
 {
        static gchar *news_cache_dir = NULL;
-
+#ifdef MAEMO
+       const gchar *data_root = prefs_common_get_data_root();
+       if (strcmp2(data_root, last_data_root)) {
+               g_free(news_cache_dir);
+               news_cache_dir = NULL;
+       }
+#endif
        if (!news_cache_dir)
+#ifndef MAEMO
                news_cache_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
                                             NEWS_CACHE_DIR, NULL);
-
+#else
+       {
+               if (data_root) {
+                       news_cache_dir = g_strconcat(data_root, G_DIR_SEPARATOR_S,
+                                            "Claws", G_DIR_SEPARATOR_S, 
+                                            g_get_user_name(), G_DIR_SEPARATOR_S,
+                                            NEWS_CACHE_DIR, NULL);
+                       g_free(last_data_root);
+                       last_data_root = g_strdup(last_data_root);
+               } else {
+                       news_cache_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+                                            NEWS_CACHE_DIR, NULL);
+                       g_free(last_data_root);
+                       last_data_root = NULL;
+               }
+       }
+#endif
        return news_cache_dir;
 }
 
 const gchar *get_imap_cache_dir(void)
 {
        static gchar *imap_cache_dir = NULL;
+#ifdef MAEMO
+       const gchar *data_root = prefs_common_get_data_root();
+       if (strcmp2(data_root, last_data_root)) {
+               g_free(imap_cache_dir);
+               imap_cache_dir = NULL;
+       }
+#endif
 
        if (!imap_cache_dir)
+#ifndef MAEMO
                imap_cache_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
                                             IMAP_CACHE_DIR, NULL);
+#else
+       {
+               if (data_root) {
+                       imap_cache_dir = g_strconcat(data_root, G_DIR_SEPARATOR_S,
+                                            "Claws", G_DIR_SEPARATOR_S, 
+                                            g_get_user_name(), G_DIR_SEPARATOR_S,
+                                            IMAP_CACHE_DIR, NULL);
+                       g_free(last_data_root);
+                       last_data_root = g_strdup(last_data_root);
+               } else {
+                       imap_cache_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+                                            IMAP_CACHE_DIR, NULL);
+                       g_free(last_data_root);
+                       last_data_root = NULL;
+               }
+       }
+#endif
 
        return imap_cache_dir;
 }
 
-const gchar *get_mbox_cache_dir(void)
-{
-       static gchar *mbox_cache_dir = NULL;
-
-       if (!mbox_cache_dir)
-               mbox_cache_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
-                                            MBOX_CACHE_DIR, NULL);
-
-       return mbox_cache_dir;
-}
-
 const gchar *get_mime_tmp_dir(void)
 {
        static gchar *mime_tmp_dir = NULL;
@@ -1915,15 +1933,29 @@ const gchar *get_template_dir(void)
        return template_dir;
 }
 
-const gchar *get_header_cache_dir(void)
+/* Return the default directory for Plugins. */
+const gchar *get_plugin_dir(void)
 {
-       static gchar *header_dir = NULL;
-
-       if (!header_dir)
-               header_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
-                                        HEADER_CACHE_DIR, NULL);
+#ifdef G_OS_WIN32
+       static gchar *plugin_dir = NULL;
 
-       return header_dir;
+       if (!plugin_dir)
+               plugin_dir = g_strconcat(w32_get_module_dir(),
+                                        "\\lib\\claws-mail\\plugins\\",
+                                        NULL);
+       return plugin_dir;
+#else
+       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
 }
 
 const gchar *get_tmp_dir(void)
@@ -1955,20 +1987,20 @@ const gchar *get_domain_name(void)
 
        if (!domain_name) {
                struct hostent *hp;
-               struct utsname uts;
+               char hostname[256];
 
-               if (uname(&uts) < 0) {
-                       perror("uname");
+               if (gethostname(hostname, sizeof(hostname)) != 0) {
+                       perror("gethostname");
                        domain_name = "unknown";
                } else {
-                       if ((hp = my_gethostbyname(uts.nodename)) == NULL) {
+                       hostname[sizeof(hostname) - 1] = '\0';
+                       if ((hp = my_gethostbyname(hostname)) == NULL) {
                                perror("gethostbyname");
-                               domain_name = g_strdup(uts.nodename);
+                               domain_name = g_strdup(hostname);
                        } else {
                                domain_name = g_strdup(hp->h_name);
                        }
                }
-
                debug_print("domain name = %s\n", domain_name);
        }
 
@@ -1990,6 +2022,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;
@@ -2016,33 +2060,6 @@ off_t get_file_size_as_crlf(const gchar *file)
        return size;
 }
 
-off_t get_left_file_size(FILE *fp)
-{
-       glong pos;
-       glong end;
-       off_t size;
-
-       if ((pos = ftell(fp)) < 0) {
-               perror("ftell");
-               return -1;
-       }
-       if (fseek(fp, 0L, SEEK_END) < 0) {
-               perror("fseek");
-               return -1;
-       }
-       if ((end = ftell(fp)) < 0) {
-               perror("fseek");
-               return -1;
-       }
-       size = end - pos;
-       if (fseek(fp, pos, SEEK_SET) < 0) {
-               perror("fseek");
-               return -1;
-       }
-
-       return size;
-}
-
 gboolean file_exist(const gchar *file, gboolean allow_fifo)
 {
        struct stat s;
@@ -2061,6 +2078,30 @@ gboolean file_exist(const gchar *file, gboolean allow_fifo)
        return FALSE;
 }
 
+
+/* Test on whether FILE is a relative file name. This is
+ * straightforward for Unix but more complex for Windows. */
+gboolean is_relative_filename(const gchar *file)
+{
+       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 >= 'a' && *file <= 'z')
+             || (*file >= 'A' && *file <= 'Z'))
+            && file[1] == ':')
+               file += 2;  /* Skip drive letter. */
+
+       return !(*file == '\\' || *file == '/');
+#else
+       return !(*file == G_DIR_SEPARATOR);
+#endif
+}
+
+
 gboolean is_dir_exist(const gchar *dir)
 {
        if (dir == NULL)
@@ -2079,7 +2120,7 @@ gboolean is_file_entry_exist(const gchar *file)
 
 gboolean dirent_is_regular_file(struct dirent *d)
 {
-#ifdef HAVE_DIRENT_D_TYPE
+#if !defined(G_OS_WIN32) && !defined(MAEMO) && defined(HAVE_DIRENT_D_TYPE)
        if (d->d_type == DT_REG)
                return TRUE;
        else if (d->d_type != DT_UNKNOWN)
@@ -2089,18 +2130,6 @@ gboolean dirent_is_regular_file(struct dirent *d)
        return g_file_test(d->d_name, G_FILE_TEST_IS_REGULAR);
 }
 
-gboolean dirent_is_directory(struct dirent *d)
-{
-#ifdef HAVE_DIRENT_D_TYPE
-       if (d->d_type == DT_DIR)
-               return TRUE;
-       else if (d->d_type != DT_UNKNOWN)
-               return FALSE;
-#endif
-
-       return g_file_test(d->d_name, G_FILE_TEST_IS_DIR);
-}
-
 gint change_dir(const gchar *dir)
 {
        gchar *prevdir = NULL;
@@ -2295,62 +2324,6 @@ gint remove_all_numbered_files(const gchar *dir)
        return remove_numbered_files(dir, 0, UINT_MAX);
 }
 
-gint remove_expired_files(const gchar *dir, guint hours)
-{
-       GDir *dp;
-       const gchar *dir_name;
-       struct stat s;
-       gchar *prev_dir;
-       gint file_no;
-       time_t mtime, now, expire_time;
-
-       prev_dir = g_get_current_dir();
-
-       if (g_chdir(dir) < 0) {
-               FILE_OP_ERROR(dir, "chdir");
-               g_free(prev_dir);
-               return -1;
-       }
-
-       if ((dp = g_dir_open(".", 0, NULL)) == NULL) {
-               g_warning("failed to open directory: %s\n", dir);
-               g_free(prev_dir);
-               return -1;
-       }
-
-       now = time(NULL);
-       expire_time = hours * 60 * 60;
-
-       while ((dir_name = g_dir_read_name(dp)) != NULL) {
-               file_no = to_number(dir_name);
-               if (file_no > 0) {
-                       if (g_stat(dir_name, &s) < 0) {
-                               FILE_OP_ERROR(dir_name, "stat");
-                               continue;
-                       }
-                       if (S_ISDIR(s.st_mode))
-                               continue;
-                       mtime = MAX(s.st_mtime, s.st_atime);
-                       if (now - mtime > expire_time) {
-                               if (g_unlink(dir_name) < 0)
-                                       FILE_OP_ERROR(dir_name, "unlink");
-                       }
-               }
-       }
-
-       g_dir_close(dp);
-
-       if (g_chdir(prev_dir) < 0) {
-               FILE_OP_ERROR(prev_dir, "chdir");
-               g_free(prev_dir);
-               return -1;
-       }
-
-       g_free(prev_dir);
-
-       return 0;
-}
-
 gint remove_dir_recursive(const gchar *dir)
 {
        struct stat s;
@@ -2446,85 +2419,6 @@ gint rename_force(const gchar *oldpath, const gchar *newpath)
        return g_rename(oldpath, newpath);
 }
 
-#if 0
-/* this seems to be slower than the stdio version... */
-gint copy_file(const gchar *src, const gchar *dest)
-{
-       gint src_fd, dest_fd;
-       gint n_read;
-       gint n_write;
-       gchar buf[BUFSIZ];
-       gchar *dest_bak = NULL;
-
-       if ((src_fd = open(src, O_RDONLY)) < 0) {
-               FILE_OP_ERROR(src, "open");
-               return -1;
-       }
-
-       if (is_file_exist(dest)) {
-               dest_bak = g_strconcat(dest, ".bak", NULL);
-               if (rename_force(dest, dest_bak) < 0) {
-                       FILE_OP_ERROR(dest, "rename");
-                       close(src_fd);
-                       g_free(dest_bak);
-                       return -1;
-               }
-       }
-
-       if ((dest_fd = open(dest, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR)) < 0) {
-               FILE_OP_ERROR(dest, "open");
-               close(src_fd);
-               if (dest_bak) {
-                       if (rename(dest_bak, dest) < 0)
-                               FILE_OP_ERROR(dest_bak, "rename");
-                       g_free(dest_bak);
-               }
-               return -1;
-       }
-
-       while ((n_read = read(src_fd, buf, sizeof(buf))) > 0) {
-               gint len = n_read;
-               gchar *bufp = buf;
-
-               while (len > 0) {
-                       n_write = write(dest_fd, bufp, len);
-                       if (n_write <= 0) {
-                               g_warning("writing to %s failed.\n", dest);
-                               close(dest_fd);
-                               close(src_fd);
-                               g_unlink(dest);
-                               if (dest_bak) {
-                                       if (rename(dest_bak, dest) < 0)
-                                               FILE_OP_ERROR(dest_bak, "rename");
-                                       g_free(dest_bak);
-                               }
-                               return -1;
-                       }
-                       len -= n_write;
-                       bufp += n_write;
-               }
-       }
-
-       close(src_fd);
-       close(dest_fd);
-
-       if (n_read < 0 || get_file_size(src) != get_file_size(dest)) {
-               g_warning("File copy from %s to %s failed.\n", src, dest);
-               g_unlink(dest);
-               if (dest_bak) {
-                       if (rename(dest_bak, dest) < 0)
-                               FILE_OP_ERROR(dest_bak, "rename");
-                       g_free(dest_bak);
-               }
-               return -1;
-       }
-       g_free(dest_bak);
-
-       return 0;
-}
-#endif
-
-
 /*
  * Append src file body to the tail of dest file.
  * Now keep_backup has no effects.
@@ -2541,7 +2435,7 @@ gint append_file(const gchar *src, const gchar *dest, gboolean keep_backup)
                FILE_OP_ERROR(src, "fopen");
                return -1;
        }
-       
+
        if ((dest_fp = g_fopen(dest, "ab")) == NULL) {
                FILE_OP_ERROR(dest, "fopen");
                fclose(src_fp);
@@ -2889,79 +2783,6 @@ gint canonicalize_file_replace(const gchar *file)
        return 0;
 }
 
-gint uncanonicalize_file(const gchar *src, const gchar *dest)
-{
-       FILE *src_fp, *dest_fp;
-       gchar buf[BUFFSIZE];
-       gboolean err = FALSE;
-
-       if ((src_fp = g_fopen(src, "rb")) == NULL) {
-               FILE_OP_ERROR(src, "fopen");
-               return -1;
-       }
-
-       if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
-               FILE_OP_ERROR(dest, "fopen");
-               fclose(src_fp);
-               return -1;
-       }
-
-       if (change_file_mode_rw(dest_fp, dest) < 0) {
-               FILE_OP_ERROR(dest, "chmod");
-               g_warning("can't change file mode\n");
-       }
-
-       while (fgets(buf, sizeof(buf), src_fp) != NULL) {
-               strcrchomp(buf);
-               if (fputs(buf, dest_fp) == EOF) {
-                       g_warning("writing to %s failed.\n", dest);
-                       fclose(dest_fp);
-                       fclose(src_fp);
-                       g_unlink(dest);
-                       return -1;
-               }
-       }
-
-       if (ferror(src_fp)) {
-               FILE_OP_ERROR(src, "fgets");
-               err = TRUE;
-       }
-       fclose(src_fp);
-       if (fclose(dest_fp) == EOF) {
-               FILE_OP_ERROR(dest, "fclose");
-               err = TRUE;
-       }
-
-       if (err) {
-               g_unlink(dest);
-               return -1;
-       }
-
-       return 0;
-}
-
-gint uncanonicalize_file_replace(const gchar *file)
-{
-       gchar *tmp_file;
-
-       tmp_file = get_tmp_file();
-
-       if (uncanonicalize_file(file, tmp_file) < 0) {
-               g_free(tmp_file);
-               return -1;
-       }
-
-       if (move_file(tmp_file, file, TRUE) < 0) {
-               g_warning("can't replace %s .\n", file);
-               g_unlink(tmp_file);
-               g_free(tmp_file);
-               return -1;
-       }
-
-       g_free(tmp_file);
-       return 0;
-}
-
 gchar *normalize_newlines(const gchar *str)
 {
        const gchar *p = str;
@@ -3035,14 +2856,13 @@ gchar *get_outgoing_rfc2822_str(FILE *fp)
  * uniqueness if everything is either quoted-printable or base64
  * encoded (note that conversion is allowed), but because MIME bodies
  * may be nested, it may happen that the same boundary has already
- * been used. We avoid scanning the message for conflicts and hope the
- * best.
+ * been used.
  *
  *   boundary := 0*69<bchars> bcharsnospace
  *   bchars := bcharsnospace / " "
  *   bcharsnospace := DIGIT / ALPHA / "'" / "(" / ")" /
- *                    "+" / "_" / "," / "-" / "." /
- *                    "/" / ":" / "=" / "?"
+ *                 "+" / "_" / "," / "-" / "." /
+ *                 "/" / ":" / "=" / "?"
  *
  * some special characters removed because of buggy MTAs
  */
@@ -3052,21 +2872,15 @@ gchar *generate_mime_boundary(const gchar *prefix)
        static gchar tbl[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
                             "abcdefghijklmnopqrstuvwxyz"
                             "1234567890+_./=";
-       gchar buf_uniq[17];
-       gchar buf_date[64];
+       gchar buf_uniq[24];
        gint i;
 
        for (i = 0; i < sizeof(buf_uniq) - 1; i++)
                buf_uniq[i] = tbl[g_random_int_range(0, sizeof(tbl) - 1)];
        buf_uniq[i] = '\0';
 
-       get_rfc822_date(buf_date, sizeof(buf_date));
-       subst_char(buf_date, ' ', '_');
-       subst_char(buf_date, ',', '_');
-       subst_char(buf_date, ':', '_');
-
-       return g_strdup_printf("%s_%s_%s", prefix ? prefix : "Multipart",
-                              buf_date, buf_uniq);
+       return g_strdup_printf("%s_/%s", prefix ? prefix : "MP",
+                              buf_uniq);
 }
 
 gint change_file_mode_rw(FILE *fp, const gchar *file)
@@ -3080,7 +2894,7 @@ gint change_file_mode_rw(FILE *fp, const gchar *file)
 
 FILE *my_tmpfile(void)
 {
-#if HAVE_MKSTEMP
+#if HAVE_MKSTEMP || defined(G_OS_WIN32)
        const gchar suffix[] = ".XXXXXX";
        const gchar *tmpdir;
        guint tmplen;
@@ -3089,12 +2903,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());
@@ -3108,14 +2923,26 @@ FILE *my_tmpfile(void)
        if (fd < 0)
                return tmpfile();
 
+#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 */
+       }
+
+#endif /* HAVE_MKSTEMP || G_OS_WIN32 */
 
        return tmpfile();
 }
@@ -3123,10 +2950,15 @@ FILE *my_tmpfile(void)
 FILE *get_tmpfile_in_dir(const gchar *dir, gchar **filename)
 {
        int fd;
-       
-       *filename = g_strdup_printf("%s%csylpheed.XXXXXX", dir, G_DIR_SEPARATOR);
+#ifdef G_OS_WIN32
+       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%cclaws.XXXXXX", dir, G_DIR_SEPARATOR);
        fd = mkstemp(*filename);
-
+#endif
        return fdopen(fd, "w+");
 }
 
@@ -3248,23 +3080,55 @@ gchar *file_read_stream_to_str(FILE *fp)
                str = tmp;
        }
 
-       return str;
+       return str;
+}
+
+
+char *fgets_crlf(char *buf, int size, FILE *stream)
+{
+       gboolean is_cr = FALSE;
+       gboolean last_was_cr = FALSE;
+       int c = 0;
+       char *cs;
+
+       cs = buf;
+       while (--size > 0 && (c = getc(stream)) != EOF)
+       {
+               *cs++ = c;
+               is_cr = (c == '\r');
+               if (c == '\n') {
+                       break;
+               }
+               if (last_was_cr) {
+                       *(--cs) = '\n';
+                       cs++;
+                       ungetc(c, stream);
+                       break;
+               }
+               last_was_cr = is_cr;
+       }
+       if (c == EOF && cs == buf)
+               return NULL;
+
+       *cs = '\0';
+
+       return buf;     
 }
 
-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;
 
@@ -3272,7 +3136,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;
        }
 
@@ -3291,7 +3155,7 @@ gint execute_command_line(const gchar *cmdline, gboolean async)
        gchar **argv;
        gint ret;
 
-       debug_print("execute_command_line(): executing: %s\n", cmdline);
+       debug_print("execute_command_line(): executing: %s\n", cmdline?cmdline:"(null)");
 
        argv = strsplit_with_quote(cmdline, " ", 0);
 
@@ -3316,26 +3180,25 @@ 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;
        }
 
        return child_stdout;
 }
-
+#ifndef MAEMO
 static gint is_unchanged_uri_char(char c)
 {
        switch (c) {
                case '(':
                case ')':
-               case ',':
                        return 0;
                default:
                        return 1;
        }
 }
 
-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;
@@ -3349,7 +3212,7 @@ void encode_uri(gchar *encoded_uri, gint bufsize, const gchar *uri)
                }
                else {
                        char * hexa = "0123456789ABCDEF";
-                       
+
                        if (k + 4 >= bufsize)
                                break;
                        encoded_uri[k++] = '%';
@@ -3359,18 +3222,18 @@ void encode_uri(gchar *encoded_uri, gint bufsize, const gchar *uri)
        }
        encoded_uri[k] = 0;
 }
-
+#endif
 gint open_uri(const gchar *uri, const gchar *cmdline)
 {
+#ifndef MAEMO
        gchar buf[BUFFSIZE];
        gchar *p;
        gchar encoded_uri[BUFFSIZE];
-       
        g_return_val_if_fail(uri != NULL, -1);
 
        /* an option to choose whether to use encode_uri or not ? */
        encode_uri(encoded_uri, BUFFSIZE, uri);
-       
+
        if (cmdline &&
            (p = strchr(cmdline, '%')) && *(p + 1) == 's' &&
            !strchr(p + 2, '%'))
@@ -3384,6 +3247,35 @@ gint open_uri(const gchar *uri, const gchar *cmdline)
        }
 
        execute_command_line(buf, TRUE);
+#else
+       extern osso_context_t *get_osso_context(void);
+       osso_rpc_run_with_defaults(get_osso_context(), "osso_browser",
+                                       OSSO_BROWSER_OPEN_NEW_WINDOW_REQ, NULL, 
+                                       DBUS_TYPE_STRING, uri, DBUS_TYPE_INVALID);
+#endif
+       return 0;
+}
+
+gint open_txt_editor(const gchar *filepath, const gchar *cmdline)
+{
+       gchar buf[BUFFSIZE];
+       gchar *p;
+
+       g_return_val_if_fail(filepath != NULL, -1);
+
+       if (cmdline &&
+           (p = strchr(cmdline, '%')) && *(p + 1) == 's' &&
+           !strchr(p + 2, '%'))
+               g_snprintf(buf, sizeof(buf), cmdline, filepath);
+       else {
+               if (cmdline)
+                       g_warning("Open Text Editor command line is invalid "
+                                 "(there must be only one '%%s'): %s",
+                                 cmdline);
+               g_snprintf(buf, sizeof(buf), DEFAULT_EDITOR_CMD, filepath);
+       }
+
+       execute_command_line(buf, TRUE);
 
        return 0;
 }
@@ -3460,9 +3352,10 @@ time_t tzoffset_sec(time_t *now)
 {
        struct tm gmt, *lt;
        gint off;
-
-       gmt = *gmtime(now);
-       lt = localtime(now);
+       struct tm buf1, buf2;
+       
+       gmt = *gmtime_r(now, &buf1);
+       lt = localtime_r(now, &buf2);
 
        off = (lt->tm_hour - gmt.tm_hour) * 60 + lt->tm_min - gmt.tm_min;
 
@@ -3490,9 +3383,10 @@ gchar *tzoffset(time_t *now)
        struct tm gmt, *lt;
        gint off;
        gchar sign = '+';
+       struct tm buf1, buf2;
 
-       gmt = *gmtime(now);
-       lt = localtime(now);
+       gmt = *gmtime_r(now, &buf1);
+       lt = localtime_r(now, &buf2);
 
        off = (lt->tm_hour - gmt.tm_hour) * 60 + lt->tm_min - gmt.tm_min;
 
@@ -3524,23 +3418,19 @@ void get_rfc822_date(gchar *buf, gint len)
        time_t t;
        gchar day[4], mon[4];
        gint dd, hh, mm, ss, yyyy;
+       struct tm buf1;
+       gchar buf2[BUFFSIZE];
 
        t = time(NULL);
-       lt = localtime(&t);
+       lt = localtime_r(&t, &buf1);
 
-       sscanf(asctime(lt), "%3s %3s %d %d:%d:%d %d\n",
+       sscanf(asctime_r(lt, buf2), "%3s %3s %d %d:%d:%d %d\n",
               day, mon, &dd, &hh, &mm, &ss, &yyyy);
+
        g_snprintf(buf, len, "%s, %d %s %d %02d:%02d:%02d %s",
                   day, dd, mon, yyyy, hh, mm, ss, tzoffset(&t));
 }
 
-/* just a wrapper to suppress the warning of gcc about %c */
-size_t my_strftime(gchar *s, size_t max, const gchar *format,
-                  const struct tm *tm)
-{
-       return strftime(s, max, format, tm);
-}
-
 void debug_set_mode(gboolean mode)
 {
        debug_mode = mode;
@@ -3565,6 +3455,14 @@ void debug_print_real(const gchar *format, ...)
        g_print("%s", buf);
 }
 
+
+const char * debug_srcname(const char *file)
+{
+       const char *s = strrchr (file, '/');
+       return s? s+1:file;
+}
+
+
 void * subject_table_lookup(GHashTable *subject_table, gchar * subject)
 {
        if (subject == NULL)
@@ -3589,21 +3487,21 @@ void subject_table_remove(GHashTable *subject_table, gchar * subject)
        if (subject == NULL)
                return;
 
-       subject += subject_get_prefix_length(subject);  
+       subject += subject_get_prefix_length(subject);
        g_hash_table_remove(subject_table, subject);
 }
 
 /*!
- *\brief       Check if a string is prefixed with known (combinations) 
- *             of prefixes. The function assumes that each prefix 
+ *\brief       Check if a string is prefixed with known (combinations)
+ *             of prefixes. The function assumes that each prefix
  *             is terminated by zero or exactly _one_ space.
  *
  *\param       str String to check for a prefixes
  *
- *\return      int Number of chars in the prefix that should be skipped 
+ *\return      int Number of chars in the prefix that should be skipped
  *             for a "clean" subject line. If no prefix was found, 0
  *             is returned.
- */            
+ */
 int subject_get_prefix_length(const gchar *subject)
 {
        /*!< Array with allowable reply prefixes regexps. */
@@ -3617,7 +3515,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];
@@ -3631,23 +3533,23 @@ int subject_get_prefix_length(const gchar *subject)
 
        if (!init_) {
                GString *s = g_string_new("");
-               
+
                for (n = 0; n < PREFIXES; n++)
                        /* Terminate each prefix regexpression by a
                         * "\ ?" (zero or ONE space), and OR them */
                        g_string_append_printf(s, "(%s\\ ?)%s",
                                          prefixes[n],
-                                         n < PREFIXES - 1 ? 
+                                         n < PREFIXES - 1 ?
                                          "|" : "");
-               
+
                g_string_prepend(s, "(");
                g_string_append(s, ")+");       /* match at least once */
                g_string_prepend(s, "^\\ *");   /* from beginning of line */
-               
 
-               /* We now have something like "^\ *((PREFIX1\ ?)|(PREFIX2\ ?))+" 
+
+               /* We now have something like "^\ *((PREFIX1\ ?)|(PREFIX2\ ?))+"
                 * TODO: Should this be       "^\ *(((PREFIX1)|(PREFIX2))\ ?)+" ??? */
-               if (regcomp(&regex, s->str, REG_EXTENDED | REG_ICASE)) { 
+               if (regcomp(&regex, s->str, REG_EXTENDED | REG_ICASE)) {
                        debug_print("Error compiling regexp %s\n", s->str);
                        g_string_free(s, TRUE);
                        return 0;
@@ -3656,32 +3558,31 @@ int subject_get_prefix_length(const gchar *subject)
                        g_string_free(s, TRUE);
                }
        }
-       
+
        if (!regexec(&regex, subject, 1, &pos, 0) && pos.rm_so != -1)
                return pos.rm_eo;
        else
                return 0;
 }
 
-guint g_stricase_hash(gconstpointer gptr)
+static guint g_stricase_hash(gconstpointer gptr)
 {
        guint hash_result = 0;
        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;
 }
 
-gint g_stricase_equal(gconstpointer gptr1, gconstpointer gptr2)
+static 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)
@@ -3694,11 +3595,17 @@ gchar *generate_msgid(gchar *buf, gint len)
        struct tm *lt;
        time_t t;
        gchar *addr;
+       struct tm buft;
 
        t = time(NULL);
-       lt = localtime(&t);
+       lt = localtime_r(&t, &buft);
 
-       addr = g_strconcat("@", get_domain_name(), NULL);
+       if (strcmp(buf, "") == 0) {
+               addr = g_strconcat("@", get_domain_name(), NULL);
+       }
+       else {
+               addr = g_strconcat("@", buf, NULL);
+       }
 
        g_snprintf(buf, len, "%04d%02d%02d%02d%02d%02d.%08x%s",
                   lt->tm_year + 1900, lt->tm_mon + 1,
@@ -3712,9 +3619,9 @@ gchar *generate_msgid(gchar *buf, gint len)
 
 /*
    quote_cmd_argument()
-   
+
    return a quoted string safely usable in argument of a command.
-   
+
    code is extracted and adapted from etPan! project -- DINH V. Hoà.
 */
 
@@ -3733,7 +3640,7 @@ gint quote_cmd_argument(gchar * result, guint size,
                if (isalnum((guchar)*p) || (* p == '/')) {
                        if (remaining > 0) {
                                * result_p = * p;
-                               result_p ++; 
+                               result_p ++;
                                remaining --;
                        }
                        else {
@@ -3741,12 +3648,12 @@ gint quote_cmd_argument(gchar * result, guint size,
                                return -1;
                        }
                }
-               else { 
+               else {
                        if (remaining >= 2) {
                                * result_p = '\\';
-                               result_p ++; 
+                               result_p ++;
                                * result_p = * p;
-                               result_p ++; 
+                               result_p ++;
                                remaining -= 2;
                        }
                        else {
@@ -3762,11 +3669,11 @@ gint quote_cmd_argument(gchar * result, guint size,
                result[size - 1] = '\0';
                return -1;
        }
-  
+
        return 0;
 }
 
-typedef struct 
+typedef struct
 {
        GNode           *parent;
        GNodeMapFunc     func;
@@ -3870,7 +3777,7 @@ void get_hex_str(gchar *out, guchar ch)
  *\brief       Register ref counted pointer. It is based on GBoxed, so should
  *             work with anything that uses the GType system. The semantics
  *             are similar to a C++ auto pointer, with the exception that
- *             C doesn't have automatic closure (calling destructors) when 
+ *             C doesn't have automatic closure (calling destructors) when
  *             exiting a block scope.
  *             Use the \ref G_TYPE_AUTO_POINTER macro instead of calling this
  *             function directly.
@@ -3886,7 +3793,7 @@ GType g_auto_pointer_register(void)
                                ("G_TYPE_AUTO_POINTER",
                                 (GBoxedCopyFunc) g_auto_pointer_copy,
                                 (GBoxedFreeFunc) g_auto_pointer_free);
-       return auto_pointer_type;                                                    
+       return auto_pointer_type;
 }
 
 /*!
@@ -3911,12 +3818,12 @@ typedef struct AutoPointer {
 /*!
  *\brief       Creates an auto pointer for a g_new()ed pointer. Example:
  *
- *\code        
+ *\code
  *
  *             ... tell gtk_list_store it should use a G_TYPE_AUTO_POINTER
  *             ... when assigning, copying and freeing storage elements
  *
- *             gtk_list_store_new(N_S_COLUMNS, 
+ *             gtk_list_store_new(N_S_COLUMNS,
  *                                G_TYPE_AUTO_POINTER,
  *                                -1);
  *
@@ -3928,16 +3835,16 @@ typedef struct AutoPointer {
  *                                S_DATA, protect,
  *                                -1);
  *
- *             ... the gtk_list_store has copied the pointer and 
+ *             ... the gtk_list_store has copied the pointer and
  *             ... incremented its reference count, we should free
  *             ... the auto pointer (in C++ a destructor would do
  *             ... this for us when leaving block scope)
- * 
+ *
  *             g_auto_pointer_free(protect);
  *
  *             ... gtk_list_store_set() now manages the data. When
- *             ... *explicitly* requesting a pointer from the list 
- *             ... store, don't forget you get a copy that should be 
+ *             ... *explicitly* requesting a pointer from the list
+ *             ... store, don't forget you get a copy that should be
  *             ... freed with g_auto_pointer_free() eventually.
  *
  *\endcode
@@ -3951,8 +3858,8 @@ GAuto *g_auto_pointer_new(gpointer p)
 {
        AutoPointerRef *ref;
        AutoPointer    *ptr;
-       
-       if (p == NULL) 
+
+       if (p == NULL)
                return NULL;
 
        ref = g_new0(AutoPointerRef, 1);
@@ -3978,20 +3885,20 @@ GAuto *g_auto_pointer_new(gpointer p)
 GAuto *g_auto_pointer_new_with_free(gpointer p, GFreeFunc free_)
 {
        AutoPointer *aptr;
-       
+
        if (p == NULL)
                return NULL;
 
        aptr = g_auto_pointer_new(p);
        aptr->ref->free = free_;
-       return aptr; 
+       return aptr;
 }
 
 gpointer g_auto_pointer_get_ptr(GAuto *auto_ptr)
 {
-       if (auto_ptr == NULL) 
+       if (auto_ptr == NULL)
                return NULL;
-       return ((AutoPointer *) auto_ptr)->ptr; 
+       return ((AutoPointer *) auto_ptr)->ptr;
 }
 
 /*!
@@ -3999,7 +3906,7 @@ gpointer g_auto_pointer_get_ptr(GAuto *auto_ptr)
  *             to call this function directly, unless you copy/assign
  *             the guarded pointer.
  *
- *\param       auto_ptr Auto pointer returned by previous call to 
+ *\param       auto_ptr Auto pointer returned by previous call to
  *             g_auto_pointer_new_XXX()
  *
  *\return      gpointer An auto pointer
@@ -4010,7 +3917,7 @@ GAuto *g_auto_pointer_copy(GAuto *auto_ptr)
        AutoPointerRef  *ref;
        AutoPointer     *newp;
 
-       if (auto_ptr == NULL) 
+       if (auto_ptr == NULL)
                return NULL;
 
        ptr = auto_ptr;
@@ -4020,7 +3927,7 @@ GAuto *g_auto_pointer_copy(GAuto *auto_ptr)
        newp->ref = ref;
        newp->ptr = ref->pointer;
        ++(ref->cnt);
-       
+
 #ifdef REF_DEBUG
        G_PRINT_REF ("XXXX COPY(%lx) -- REF (%d)\n", ref->pointer, ref->cnt);
 #endif
@@ -4034,7 +3941,7 @@ void g_auto_pointer_free(GAuto *auto_ptr)
 {
        AutoPointer     *ptr;
        AutoPointerRef  *ref;
-       
+
        if (auto_ptr == NULL)
                return;
 
@@ -4047,12 +3954,12 @@ void g_auto_pointer_free(GAuto *auto_ptr)
 #endif
                ref->free(ref->pointer);
                g_free(ref);
-       } 
+       }
 #ifdef REF_DEBUG
        else
                G_PRINT_REF ("XXXX DEREF(%lx) -- REF (%d)\n", ref->pointer, ref->cnt);
 #endif
-       g_free(ptr);            
+       g_free(ptr);
 }
 
 void replace_returns(gchar *str)
@@ -4071,9 +3978,10 @@ void replace_returns(gchar *str)
 /* get_uri_part() - retrieves a URI starting from scanpos.
                    Returns TRUE if succesful */
 gboolean get_uri_part(const gchar *start, const gchar *scanpos,
-                            const gchar **bp, const gchar **ep)
+                            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);
@@ -4084,10 +3992,18 @@ gboolean get_uri_part(const gchar *start, const gchar *scanpos,
 
        /* find end point of URI */
        for (ep_ = scanpos; *ep_ != '\0'; ep_++) {
-               if (!isgraph(*(const guchar *)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 */
@@ -4096,10 +4012,10 @@ 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)      (ispunct(ch) && ((ch) != '/')) 
+#define IS_REAL_PUNCT(ch)      (g_ascii_ispunct(ch) && !strchr("/?=-)", ch))
 
        for (; ep_ - 1 > scanpos + 1 &&
-              IS_REAL_PUNCT(*(const guchar *)(ep_ - 1));
+              IS_REAL_PUNCT(*(ep_ - 1));
             ep_--)
                ;
 
@@ -4107,11 +4023,13 @@ gboolean get_uri_part(const gchar *start, const gchar *scanpos,
 
        *ep = ep_;
 
-       return TRUE;            
+       return TRUE;
 }
 
 gchar *make_uri_string(const gchar *bp, const gchar *ep)
 {
+       while (bp && *bp && g_ascii_isspace(*bp))
+               bp++;
        return g_strndup(bp, ep - bp);
 }
 
@@ -4156,13 +4074,13 @@ 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);
-       
+
        g_return_val_if_fail(htab, NULL);
-       for (n = 0; n < sizeof toplvl_domains / sizeof toplvl_domains[0]; n++) 
+       for (n = 0; n < sizeof toplvl_domains / sizeof toplvl_domains[0]; n++)
                g_hash_table_insert(htab, (gpointer) toplvl_domains[n], (gpointer) toplvl_domains[n]);
        return htab;
 }
@@ -4173,7 +4091,7 @@ static gboolean is_toplvl_domain(GHashTable *tab, const gchar *first, const gcha
        gchar buf[MAX_LVL_DOM_NAME_LEN + 1];
        const gchar *m = buf + MAX_LVL_DOM_NAME_LEN + 1;
        register gchar *p;
-       
+
        if (last - first > MAX_LVL_DOM_NAME_LEN || first > last)
                return FALSE;
 
@@ -4186,7 +4104,7 @@ static gboolean is_toplvl_domain(GHashTable *tab, const gchar *first, const gcha
 
 /* get_email_part() - retrieves an email address. Returns TRUE if succesful */
 gboolean get_email_part(const gchar *start, const gchar *scanpos,
-                              const gchar **bp, const gchar **ep)
+                              const gchar **bp, const gchar **ep, gboolean hdr)
 {
        /* more complex than the uri part because we need to scan back and forward starting from
         * the scan position. */
@@ -4197,7 +4115,7 @@ gboolean get_email_part(const gchar *start, const gchar *scanpos,
        const gchar *last_dot = NULL;
        const gchar *prelast_dot = NULL;
        const gchar *last_tld_char = NULL;
-       
+
        /* the informative part of the email address (describing the name
         * of the email address owner) may contain quoted parts. the
         * closure stack stores the last encountered quotes. */
@@ -4209,9 +4127,71 @@ gboolean get_email_part(const gchar *start, const gchar *scanpos,
        g_return_val_if_fail(bp != NULL, FALSE);
        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, ";"))
+                       *ep = strstr(start,",") < strstr(start, ";")
+                               ? strstr(start, ",") : strstr(start, ";");
+               else if (strstr(start, ","))
+                       *ep = strstr(start, ",");
+               else if (strstr(start, ";"))
+                       *ep = strstr(start, ";");
+               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)
+                       return TRUE;
+               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;
+       }
+
        if (!dom_tab)
                dom_tab = create_domain_tab();
-       g_return_val_if_fail(dom_tab, FALSE);   
+       g_return_val_if_fail(dom_tab, FALSE);
 
        /* scan start of address */
        for (bp_ = scanpos - 1;
@@ -4232,7 +4212,7 @@ gboolean get_email_part(const gchar *start, const gchar *scanpos,
                                last_dot = ep_;
                                if (*(last_dot + 1) == '.') {
                                        if (prelast_dot == NULL)
-                                               return FALSE;
+                                               return FALSE;
                                        last_dot = prelast_dot;
                                        break;
                                }
@@ -4265,21 +4245,21 @@ gboolean get_email_part(const gchar *start, const gchar *scanpos,
 
        if (!result) return FALSE;
 
-       if (*ep_ && *(bp_ - 1) == '"' && *(ep_) == '"' 
+       if (*ep_ && bp_ != start && *(bp_ - 1) == '"' && *(ep_) == '"'
        && *(ep_ + 1) == ' ' && *(ep_ + 2) == '<'
        && IS_RFC822_CHAR(*(ep_ + 3))) {
-               /* this informative part with an @ in it is 
+               /* this informative part with an @ in it is
                 * followed by the email address */
                ep_ += 3;
-               
+
                /* go to matching '>' (or next non-rfc822 char, like \n) */
                for (; *ep_ != '>' && *ep != '\0' && IS_RFC822_CHAR(*ep_); ep_++)
                        ;
-                       
+
                /* include the bracket */
                if (*ep_ == '>') ep_++;
-               
-               /* include the leading quote */         
+
+               /* include the leading quote */
                bp_--;
 
                *ep = ep_;
@@ -4319,7 +4299,7 @@ gboolean get_email_part(const gchar *start, const gchar *scanpos,
                }
 
                /* if nothing in the closure stack, do the special conditions
-                * the following if..else expression simply checks whether 
+                * the following if..else expression simply checks whether
                 * a token is acceptable. if not acceptable, the clause
                 * should terminate the loop with a 'break' */
                if (!PEEK_STACK()) {
@@ -4328,7 +4308,7 @@ gboolean get_email_part(const gchar *start, const gchar *scanpos,
                        && (((bp_ + 1) < ep_)    && isalnum(*(bp_ + 1)))) {
                                /* hyphens are allowed, but only in
                                   between alnums */
-                       } else if (!strchr(",;:=?./+<>!&\r\n\t", *bp_)) {
+                       } else if (strchr(" \"'", *bp_)) {
                                /* but anything not being a punctiation
                                   is ok */
                        } else {
@@ -4339,19 +4319,19 @@ gboolean get_email_part(const gchar *start, const gchar *scanpos,
 
        bp_++;
 
+       /* scan forward (should start with an alnum) */
+       for (; *bp_ != '<' && isspace(*bp_) && *bp_ != '"'; bp_++)
+               ;
 #undef PEEK_STACK
 #undef PUSH_STACK
 #undef POP_STACK
 #undef IN_STACK
 #undef FULL_STACK
 
-       /* scan forward (should start with an alnum) */
-       for (; *bp_ != '<' && isspace(*bp_) && *bp_ != '"'; bp_++)
-               ;
 
-       *ep = ep_;
        *bp = bp_;
-       
+       *ep = ep_;
+
        return result;
 }
 
@@ -4379,6 +4359,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);
@@ -4386,7 +4368,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];
@@ -4394,27 +4376,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] == ' ') 
+                       while (trimmed[strlen(trimmed)-1] == '\n')
                                trimmed[strlen(trimmed)-1] = '\0';
-                       while (trimmed[strlen(trimmed)-1] == '\n') 
+                       while (trimmed[strlen(trimmed)-1] == '\r')
                                trimmed[strlen(trimmed)-1] = '\0';
-                       while (trimmed[strlen(trimmed)-1] == '\r') 
+                       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;
@@ -4425,6 +4451,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);
@@ -4432,15 +4463,503 @@ 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];
+       gboolean err = FALSE;
+
+       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 {
+                       if(fputs(buf, outfp) == EOF) {
+                               err = TRUE;
+                               break;
+                       }
+               }
+               g_strfreev(parts);
+       }
+       if (fprintf(outfp, "%s; %s\n", type, command) < 0)
+               err = TRUE;
+
+       if (fp)
+               fclose(fp);
+
+       if (fclose(outfp) == EOF)
+               err = TRUE;
+               
+       if (!err)
+               g_rename(outpath, path);
+
+       g_free(path);
+       g_free(outpath);
+}
+
+gint copy_dir(const gchar *src, const gchar *dst)
+{
+       GDir *dir;
+       const gchar *name;
+
+       if ((dir = g_dir_open(src, 0, NULL)) == NULL) {
+               g_warning("failed to open directory: %s\n", src);
+               return -1;
+       }
+
+       if (make_dir(dst) < 0)
+               return -1;
+
+       while ((name = g_dir_read_name(dir)) != NULL) {
+               gchar *old_file, *new_file;
+               old_file = g_strconcat(src, G_DIR_SEPARATOR_S, name, NULL);
+               new_file = g_strconcat(dst, G_DIR_SEPARATOR_S, name, NULL);
+               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) {
+                               g_dir_close(dir);
+                               return r;
+                       }
+                }
+#ifndef G_OS_WIN32
+                /* Windows has no symlinks.  Or well, Vista seems to
+                   have something like this but the semantics might be
+                   different.  Thus we don't use it under Windows. */
+                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;
+                       }
+                 }
+#endif /*G_OS_WIN32*/
+               else if (g_file_test(old_file, G_FILE_TEST_IS_DIR)) {
+                       gint r = copy_dir(old_file, new_file);
+                       if (r < 0) {
+                               g_dir_close(dir);
+                               return r;
+                       }
+               }
+       }
+       g_dir_close(dir);
+       return 0;
+}
+
+/* crude test to see if a file is an email. */
+gboolean file_is_email (const gchar *filename)
+{
+       FILE *fp = NULL;
+       gchar buffer[2048];
+       gint i = 0;
+       gint score = 0;
+       if (filename == NULL)
+               return FALSE;
+       if ((fp = g_fopen(filename, "rb")) == NULL)
+               return FALSE;
+       while (i < 60 && score < 3
+              && fgets(buffer, sizeof (buffer), fp) > 0) {
+               if (!strncmp(buffer, "From:", strlen("From:")))
+                       score++;
+               if (!strncmp(buffer, "To:", strlen("To:")))
+                       score++;
+               if (!strncmp(buffer, "Subject:", strlen("Subject:")))
+                       score++;
+               i++;
+       }
+       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;
+}
+
+#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;
+}