Fix memory leak
[claws.git] / src / common / utils.c
index d1123c3e5fef015c9a382f04e6e1478938d45cb7..ff476f1556c3963f720307d071fa24457df0f5a9 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto & The Claws Mail Team
+ * Copyright (C) 1999-2013 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
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
 
 #include <glib/gi18n.h>
 
+#ifdef USE_PTHREAD
+#include <pthread.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <sys/utsname.h>
 #endif
 
+#include <fcntl.h>
+
 #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"
 #include "socket.h"
 #include "../codeconv.h"
@@ -183,18 +180,41 @@ gint g_chmod(const gchar *path, gint mode)
        return chmod(path, mode);
 #endif
 }
+
+FILE* g_fopen(const gchar *filename, const gchar *mode)
+{
+#ifdef G_OS_WIN32
+       char *name = g_win32_locale_filename_from_utf8(filename);
+       FILE* fp = fopen(name, mode);
+       g_free(name);
+       return fp;
+#else
+       return fopen(filename, mode);
+#endif
+}
+int g_open(const gchar *filename, int flags, int mode)
+{
+#ifdef G_OS_WIN32
+       char *name = g_win32_locale_filename_from_utf8(filename);
+       int fd = open(name, flags, mode);
+       g_free(name);
+       return fp;
+#else
+       return open(filename, flags, mode);
+#endif
+}
 #endif /* GLIB_CHECK_VERSION && G_OS_UNIX */
 
 
 #ifdef G_OS_WIN32
-gint mkstemp_name(const gchar *template, gchar **name_used)
+gint mkstemp_name(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),
+       tmpfd = g_open (*name_used, (O_CREAT | O_RDWR | O_BINARY),
                                    (S_IRUSR | S_IWUSR));
 
        tempfiles=g_slist_append(tempfiles, g_strdup(*name_used));
@@ -208,7 +228,7 @@ gint mkstemp_name(const gchar *template, gchar **name_used)
 #endif /* G_OS_WIN32 */
 
 #ifdef G_OS_WIN32
-gint mkstemp(const gchar *template)
+gint mkstemp(gchar *template)
 {
        gchar *dummyname;
        gint res = mkstemp_name(template, &dummyname);
@@ -235,6 +255,16 @@ void slist_free_strings(GSList *list)
        }
 }
 
+void slist_free_strings_full(GSList *list)
+{
+#if GLIB_CHECK_VERSION(2,28,0)
+       g_slist_free_full(list, (GDestroyNotify)g_free);
+#else
+       g_slist_foreach(list, (GFunc)g_free, NULL);
+       g_slist_free(list);
+#endif
+}
+
 static void hash_free_strings_func(gpointer key, gpointer value, gpointer data)
 {
        g_free(key);
@@ -269,7 +299,7 @@ void ptr_array_free_strings(GPtrArray *array)
        gint i;
        gchar *str;
 
-       g_return_if_fail(array != NULL);
+       cm_return_if_fail(array != NULL);
 
        for (i = 0; i < array->len; i++) {
                str = g_ptr_array_index(array, i);
@@ -277,16 +307,6 @@ void ptr_array_free_strings(GPtrArray *array)
        }
 }
 
-gboolean str_find(const gchar *haystack, const gchar *needle)
-{
-       return strstr(haystack, needle) != NULL ? TRUE : FALSE;
-}
-
-gboolean str_case_find(const gchar *haystack, const gchar *needle)
-{
-       return strcasestr(haystack, needle) != NULL ? TRUE : FALSE;
-}
-
 gint to_number(const gchar *nstr)
 {
        register const gchar *p;
@@ -322,7 +342,14 @@ gchar *itos(gint n)
        d = (d*100) >> divisor;         \
 }
 
-gchar *to_human_readable(off_t size)
+
+/*!
+ * \brief Convert a given size in bytes in a human-readable string
+ *
+ * \param size  The size expressed in bytes to convert in string
+ * \return      The string that respresents the size in an human-readable way
+ */
+gchar *to_human_readable(goffset size)
 {
        static gchar str[14];
        static gchar *b_format = NULL, *kb_format = NULL, 
@@ -335,19 +362,19 @@ gchar *to_human_readable(off_t size)
                gb_format = _("%.2fGB");
        }
        
-       if (size < (off_t)1024) {
+       if (size < (goffset)1024) {
                g_snprintf(str, sizeof(str), b_format, (gint)size);
                return str;
-       } else if (size >> 10 < (off_t)1024) {
+       } else if (size >> 10 < (goffset)1024) {
                divide(size, 10, t, r);
                g_snprintf(str, sizeof(str), kb_format, t, r);
                return str;
-       } else if (size >> 20 < (off_t)1024) {
+       } else if (size >> 20 < (goffset)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));
+               g_snprintf(str, sizeof(str), gb_format, (gfloat)(size >> 30));
                return str;
        }
 }
@@ -456,11 +483,11 @@ gint file_strip_crs(const gchar *file)
        if (file == NULL)
                goto freeout;
 
-       fp = fopen(file, "rb");
+       fp = g_fopen(file, "rb");
        if (!fp)
                goto freeout;
 
-       outfp = fopen(out, "wb");
+       outfp = g_fopen(out, "wb");
        if (!outfp) {
                fclose(fp);
                goto freeout;
@@ -480,12 +507,13 @@ gint file_strip_crs(const gchar *file)
                goto unlinkout;
        }
        
-       if (rename_force(out, file) < 0)
+       if (move_file(out, file, TRUE) < 0)
                goto unlinkout;
        
+       g_free(out);
        return 0;
 unlinkout:
-       g_unlink(out);
+       claws_unlink(out);
 freeout:
        g_free(out);
        return -1;
@@ -494,9 +522,15 @@ freeout:
 /* Similar to `strstr' but this function ignores the case of both strings.  */
 gchar *strcasestr(const gchar *haystack, const gchar *needle)
 {
-       register size_t haystack_len, needle_len;
+       size_t haystack_len = strlen(haystack);
+
+       return strncasestr(haystack, haystack_len, needle);
+}
+
+gchar *strncasestr(const gchar *haystack, gint haystack_len, const gchar *needle)
+{
+       register size_t needle_len;
 
-       haystack_len = strlen(haystack);
        needle_len   = strlen(needle);
 
        if (haystack_len < needle_len || needle_len == 0)
@@ -679,7 +713,7 @@ void eliminate_parenthesis(gchar *str, gchar op, gchar cl)
        register gchar *srcp, *destp;
        gint in_brace;
 
-       srcp = destp = str;
+       destp = str;
 
        while ((destp = strchr(destp, op))) {
                in_brace = 1;
@@ -703,7 +737,7 @@ void extract_parenthesis(gchar *str, gchar op, gchar cl)
        register gchar *srcp, *destp;
        gint in_brace;
 
-       srcp = destp = str;
+       destp = str;
 
        while ((srcp = strchr(destp, op))) {
                if (destp > str)
@@ -732,7 +766,7 @@ static void extract_parenthesis_with_skip_quote(gchar *str, gchar quote_chr,
        gint in_brace;
        gboolean in_quote = FALSE;
 
-       srcp = destp = str;
+       destp = str;
 
        while ((srcp = strchr_with_skip_quote(destp, quote_chr, op))) {
                if (destp > str)
@@ -773,12 +807,53 @@ void extract_quote(gchar *str, gchar quote_chr)
        }
 }
 
+/* Returns a newly allocated string with all quote_chr not at the beginning
+   or the end of str escaped with '\' or the given str if not required. */
+gchar *escape_internal_quotes(gchar *str, gchar quote_chr)
+{
+       register gchar *p, *q;
+       gchar *qstr;
+       int k = 0, l = 0;
+
+       if (str == NULL || *str == '\0')
+               return str;
+
+       /* search for unescaped quote_chr */
+       p = str;
+       if (*p == quote_chr)
+               ++p, ++l;
+       while (*p) {
+               if (*p == quote_chr && *(p - 1) != '\\' && *(p + 1) != '\0')
+                       ++k;
+               ++p, ++l;
+       }
+       if (!k) /* nothing to escape */
+               return str;
+
+       /* unescaped quote_chr found */
+       qstr = g_malloc(l + k + 1);
+       p = str;
+       q = qstr;
+       if (*p == quote_chr) {
+               *q = quote_chr;
+               ++p, ++q;
+       }
+       while (*p) {
+               if (*p == quote_chr && *(p - 1) != '\\' && *(p + 1) != '\0')
+                       *q++ = '\\';
+               *q++ = *p++;
+       }
+       *q = '\0';
+
+       return qstr;
+}
+
 void eliminate_address_comment(gchar *str)
 {
        register gchar *srcp, *destp;
        gint in_brace;
 
-       srcp = destp = str;
+       destp = str;
 
        while ((destp = strchr(destp, '"'))) {
                if ((srcp = strchr(destp + 1, '"'))) {
@@ -795,7 +870,7 @@ void eliminate_address_comment(gchar *str)
                }
        }
 
-       srcp = destp = str;
+       destp = str;
 
        while ((destp = strchr_with_skip_quote(destp, '"', '('))) {
                in_brace = 1;
@@ -965,20 +1040,23 @@ GSList *newsgroup_list_append(GSList *group_list, const gchar *str)
 GList *add_history(GList *list, const gchar *str)
 {
        GList *old;
+       gchar *oldstr;
 
-       g_return_val_if_fail(str != NULL, list);
+       cm_return_val_if_fail(str != NULL, list);
 
        old = g_list_find_custom(list, (gpointer)str, (GCompareFunc)strcmp2);
        if (old) {
-               g_free(old->data);
+               oldstr = old->data;
                list = g_list_remove(list, old->data);
+               g_free(oldstr);
        } else if (g_list_length(list) >= MAX_HISTORY_SIZE) {
                GList *last;
 
                last = g_list_last(list);
                if (last) {
-                       g_free(last->data);
+                       oldstr = last->data;
                        list = g_list_remove(list, last->data);
+                       g_free(oldstr);
                }
        }
 
@@ -1096,7 +1174,7 @@ static const gchar * line_has_quote_char_last(const gchar * str, const gchar *qu
        int i;
 
        if (quote_chars == NULL)
-               return FALSE;
+               return NULL;
 
        for (i = 0; i < strlen(quote_chars); i++) {
                tmp_pos = strrchr (str, quote_chars[i]);
@@ -1134,8 +1212,8 @@ gint get_quote_level(const gchar *str, const gchar *quote_chars)
                if (strchr(quote_chars, *p))
                        quote_level++;
                else if (*p != '-' && !g_ascii_isspace(*p) && p <= last_pos) {
-                       /* any characters are allowed except '-' and space */
-                       while (*p != '-'
+                       /* any characters are allowed except '-','<' and space */
+                       while (*p != '-' && *p != '<'
                               && !strchr(quote_chars, *p)
                               && !g_ascii_isspace(*p)
                               && p < last_pos)
@@ -1224,6 +1302,9 @@ static gchar *strstr_with_skip_quote(const gchar *haystack, const gchar *needle)
                                in_dquote = FALSE;
                        else if (!in_squote)
                                in_dquote = TRUE;
+               } else if (*haystack == '\\') {
+                       haystack++;
+                       haystack_len--;
                }
 
                haystack++;
@@ -1240,8 +1321,8 @@ gchar **strsplit_with_quote(const gchar *str, const gchar *delim,
        gchar **str_array, *s, *new_str;
        guint i, n = 1, len;
 
-       g_return_val_if_fail(str != NULL, NULL);
-       g_return_val_if_fail(delim != NULL, NULL);
+       cm_return_val_if_fail(str != NULL, NULL);
+       cm_return_val_if_fail(delim != NULL, NULL);
 
        if (max_tokens < 1)
                max_tokens = G_MAXINT;
@@ -1300,7 +1381,7 @@ gchar *get_abbrev_newsgroup_name(const gchar *group, gint len)
        const gchar *p = group;
        const gchar *last;
 
-       g_return_val_if_fail(group != NULL, NULL);
+       cm_return_val_if_fail(group != NULL, NULL);
 
        last = group + strlen(group);
        abbrev_group = ap = g_malloc(strlen(group) + 1);
@@ -1382,6 +1463,7 @@ GList *uri_list_extract_filenames(const gchar *uri_list)
                     * g_filename_from_uri() rejects escaped/locale encoded uri
                     * string which come from Nautilus.
                     */
+#ifndef G_OS_WIN32
                                        if (g_utf8_validate(file, -1, NULL))
                                                locale_file
                                                        = conv_codeset_strdup(
@@ -1390,6 +1472,9 @@ GList *uri_list_extract_filenames(const gchar *uri_list)
                                                                conv_get_locale_charset_str());
                                        if (!locale_file)
                                                locale_file = g_strdup(file + 5);
+#else
+                                       locale_file = g_filename_from_uri(file, NULL, NULL);
+#endif
                                        result = g_list_append(result, locale_file);
                                }
                        }
@@ -1510,18 +1595,20 @@ void decode_uri(gchar *decoded_uri, const gchar *encoded_uri)
 static gchar *decode_uri_gdup(const gchar *encoded_uri)
 {
     gchar *buffer = g_malloc(strlen(encoded_uri)+1);
-    decode_uri(buffer, encoded_uri);
+    decode_uri_with_plus(buffer, encoded_uri, FALSE);
     return buffer;
 }
 
-gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
-                    gchar **subject, gchar **body, gchar ***attach)
+gint scan_mailto_url(const gchar *mailto, gchar **from, gchar **to, gchar **cc, gchar **bcc,
+                    gchar **subject, gchar **body, gchar ***attach, gchar **inreplyto)
 {
        gchar *tmp_mailto;
        gchar *p;
        const gchar *forbidden_uris[] = { ".gnupg/",
                                          "/etc/passwd",
                                          "/etc/shadow",
+                                         ".ssh/",
+                                         "../",
                                          NULL };
        gint num_attach = 0;
        gchar **my_att = NULL;
@@ -1563,7 +1650,16 @@ gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
 
                if (*value == '\0') continue;
 
-               if (cc && !g_ascii_strcasecmp(field, "cc")) {
+               if (from && !g_ascii_strcasecmp(field, "from")) {
+                       if (!*from) {
+                               *from = decode_uri_gdup(value);
+                       } else {
+                               gchar *tmp = decode_uri_gdup(value);
+                               gchar *new_from = g_strdup_printf("%s, %s", *from, tmp);
+                               g_free(*from);
+                               *from = new_from;
+                       }
+               } else if (cc && !g_ascii_strcasecmp(field, "cc")) {
                        if (!*cc) {
                                *cc = decode_uri_gdup(value);
                        } else {
@@ -1588,8 +1684,8 @@ gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
                        *body = decode_uri_gdup(value);
                } else if (body && !*body && !g_ascii_strcasecmp(field, "insert")) {
                        gchar *tmp = decode_uri_gdup(value);
-                       if (!g_file_get_contents(value, body, NULL, NULL)) {
-                               g_error("Error: couldn't set insert file '%s' in body\n", value);
+                       if (!g_file_get_contents(tmp, body, NULL, NULL)) {
+                               g_warning("Error: couldn't set insert file '%s' in body\n", value);
                        }
                        g_free(tmp);
                        tmp = NULL;
@@ -1608,11 +1704,13 @@ gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
                        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;
                        }
+               } else if (inreplyto && !*inreplyto &&
+                          !g_ascii_strcasecmp(field, "in-reply-to")) {
+                       *inreplyto = decode_uri_gdup(value);
                }
        }
 
@@ -1708,7 +1806,7 @@ w32_shgetfolderpath (HWND a, int b, HANDLE c, DWORD d, LPSTR e)
          handle = dlopen (dllnames[i], RTLD_LAZY);
          if (handle)
            {
-             func = dlsym (handle, "SHGetFolderPathA");
+             func = dlsym (handle, "SHGetFolderPathW");
              if (!func)
                {
                  dlclose (handle);
@@ -1769,15 +1867,16 @@ const gchar *get_locale_dir(void)
 const gchar *get_home_dir(void)
 {
 #ifdef G_OS_WIN32
-       static char home_dir[MAX_PATH] = "";
-
-       if (home_dir[0] == '\0') {
+       static char home_dir_utf16[MAX_PATH] = "";
+       static gchar *home_dir_utf8 = NULL;
+       if (home_dir_utf16[0] == '\0') {
                if (w32_shgetfolderpath
                            (NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE,
-                            NULL, 0, home_dir) < 0)
-                               strcpy (home_dir, "C:\\Sylpheed");
+                            NULL, 0, home_dir_utf16) < 0)
+                               strcpy (home_dir_utf16, "C:\\Sylpheed");
+               home_dir_utf8 = g_utf16_to_utf8 ((const gunichar *)home_dir_utf16, -1, NULL, NULL, NULL);
        }
-       return home_dir;
+       return home_dir_utf8;
 #else
        static const gchar *homeenv = NULL;
 
@@ -1798,30 +1897,42 @@ static gboolean rc_dir_alt = FALSE;
 const gchar *get_rc_dir(void)
 {
 
-       if (!claws_rc_dir)
+       if (!claws_rc_dir) {
                claws_rc_dir = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
                                     RC_DIR, NULL);
-
+               debug_print("using default rc_dir %s\n", claws_rc_dir);
+       }
        return claws_rc_dir;
 }
 
 void set_rc_dir(const gchar *dir)
 {
+       gchar *canonical_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);
+               int err = cm_canonicalize_filename(dir, &canonical_dir);
+               int len;
+
+               if (err) {
+                       g_print("Error looking for %s: %d(%s)\n",
+                               dir, -err, strerror(-err));
+                       exit(0);
                }
+               rc_dir_alt = TRUE;
+
+               claws_rc_dir = canonical_dir;
+               
+               len = strlen(claws_rc_dir);
+               if (claws_rc_dir[len - 1] == G_DIR_SEPARATOR)
+                       claws_rc_dir[len - 1] = '\0';
+               
                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);
+                               exit(0);
                        }
                }
        }
@@ -1833,90 +1944,26 @@ gboolean rc_dir_is_alt(void) {
 
 const gchar *get_mail_base_dir(void)
 {
-#ifdef G_OS_WIN32
-       static gchar *mail_base_dir = NULL;
-
-       if (!mail_base_dir)
-               mail_base_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
-                                           "Mailboxes", NULL);
-
-       return mail_base_dir;
-#else
        return get_home_dir();
-#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;
 }
@@ -1943,6 +1990,29 @@ const gchar *get_template_dir(void)
        return template_dir;
 }
 
+#ifdef G_OS_WIN32
+const gchar *get_cert_file(void)
+{
+       const gchar *cert_file = NULL;
+       if (!cert_file)
+               cert_file = g_strconcat(w32_get_module_dir(),
+                                "\\share\\claws-mail\\",
+                               "ca-certificates.crt",
+                               NULL);  
+       return cert_file;
+}
+#endif
+
+/* Return the filepath of the claws-mail.desktop file */
+const gchar *get_desktop_file(void)
+{
+#ifdef DESKTOPFILEPATH
+  return DESKTOPFILEPATH;
+#else
+  return NULL;
+#endif
+}
+
 /* Return the default directory for Plugins. */
 const gchar *get_plugin_dir(void)
 {
@@ -1968,6 +2038,21 @@ const gchar *get_plugin_dir(void)
 #endif
 }
 
+
+#ifdef G_OS_WIN32
+/* Return the default directory for Themes. */
+const gchar *get_themes_dir(void)
+{
+       static gchar *themes_dir = NULL;
+
+       if (!themes_dir)
+               themes_dir = g_strconcat(w32_get_module_dir(),
+                                        "\\share\\claws-mail\\themes",
+                                        NULL);
+       return themes_dir;
+}
+#endif
+
 const gchar *get_tmp_dir(void)
 {
        static gchar *tmp_dir = NULL;
@@ -2001,7 +2086,7 @@ const gchar *get_domain_name(void)
 
                if (gethostname(hostname, sizeof(hostname)) != 0) {
                        perror("gethostname");
-                       domain_name = "unknown";
+                       domain_name = "localhost";
                } else {
                        hostname[sizeof(hostname) - 1] = '\0';
                        if ((hp = my_gethostbyname(hostname)) == NULL) {
@@ -2016,7 +2101,7 @@ const gchar *get_domain_name(void)
 
        return domain_name;
 #else
-       return "unknown";
+       return "localhost";
 #endif
 }
 
@@ -2051,7 +2136,7 @@ off_t get_file_size_as_crlf(const gchar *file)
        gchar buf[BUFFSIZE];
 
        if ((fp = g_fopen(file, "rb")) == NULL) {
-               FILE_OP_ERROR(file, "fopen");
+               FILE_OP_ERROR(file, "g_fopen");
                return -1;
        }
 
@@ -2130,7 +2215,7 @@ gboolean is_file_entry_exist(const gchar *file)
 
 gboolean dirent_is_regular_file(struct dirent *d)
 {
-#if !defined(G_OS_WIN32) && !defined(MAEMO) && defined(HAVE_DIRENT_D_TYPE)
+#if !defined(G_OS_WIN32) && defined(HAVE_DIRENT_D_TYPE)
        if (d->d_type == DT_REG)
                return TRUE;
        else if (d->d_type != DT_UNKNOWN)
@@ -2223,7 +2308,7 @@ gint remove_all_files(const gchar *dir)
        }
 
        while ((dir_name = g_dir_read_name(dp)) != NULL) {
-               if (g_unlink(dir_name) < 0)
+               if (claws_unlink(dir_name) < 0)
                        FILE_OP_ERROR(dir_name, "unlink");
        }
 
@@ -2247,6 +2332,18 @@ gint remove_numbered_files(const gchar *dir, guint first, guint last)
        gchar *prev_dir;
        gint file_no;
 
+       if (first == last) {
+               /* Skip all the dir reading part. */
+               gchar *filename = g_strdup_printf("%s%s%u", dir, G_DIR_SEPARATOR_S, first);
+               if (claws_unlink(filename) < 0) {
+                       FILE_OP_ERROR(filename, "unlink");
+                       g_free(filename);
+                       return -1;
+               }
+               g_free(filename);
+               return 0;
+       }
+
        prev_dir = g_get_current_dir();
 
        if (g_chdir(dir) < 0) {
@@ -2266,7 +2363,7 @@ gint remove_numbered_files(const gchar *dir, guint first, guint last)
                if (file_no > 0 && first <= file_no && file_no <= last) {
                        if (is_dir_exist(dir_name))
                                continue;
-                       if (g_unlink(dir_name) < 0)
+                       if (claws_unlink(dir_name) < 0)
                                FILE_OP_ERROR(dir_name, "unlink");
                }
        }
@@ -2290,6 +2387,10 @@ gint remove_numbered_files_not_in_list(const gchar *dir, GSList *numberlist)
        const gchar *dir_name;
        gchar *prev_dir;
        gint file_no;
+       GHashTable *file_no_tbl;
+
+       if (numberlist == NULL)
+           return 0;
 
        prev_dir = g_get_current_dir();
 
@@ -2305,18 +2406,26 @@ gint remove_numbered_files_not_in_list(const gchar *dir, GSList *numberlist)
                return -1;
        }
 
+       file_no_tbl = g_hash_table_new(g_direct_hash, g_direct_equal);
        while ((dir_name = g_dir_read_name(dp)) != NULL) {
                file_no = to_number(dir_name);
-               if (file_no > 0 && (g_slist_find(numberlist, GINT_TO_POINTER(file_no)) == NULL)) {
-                       debug_print("removing unwanted file %d from %s\n", file_no, dir);
-                       if (is_dir_exist(dir_name))
-                               continue;
-                       if (g_unlink(dir_name) < 0)
+               if (is_dir_exist(dir_name))
+                   continue;
+               if (file_no > 0)
+                   g_hash_table_insert(file_no_tbl, GINT_TO_POINTER(file_no), GINT_TO_POINTER(1));
+       }
+       
+       do {
+               if (g_hash_table_lookup(file_no_tbl, numberlist->data) == NULL) {
+                       debug_print("removing unwanted file %d from %s\n", 
+                                   GPOINTER_TO_INT(numberlist->data), dir);
+                       if (claws_unlink(dir_name) < 0)
                                FILE_OP_ERROR(dir_name, "unlink");
                }
-       }
+       } while ((numberlist = g_slist_next(numberlist)));
 
        g_dir_close(dp);
+       g_hash_table_destroy(file_no_tbl);
 
        if (g_chdir(prev_dir) < 0) {
                FILE_OP_ERROR(prev_dir, "chdir");
@@ -2348,7 +2457,7 @@ gint remove_dir_recursive(const gchar *dir)
        }
 
        if (!S_ISDIR(s.st_mode)) {
-               if (g_unlink(dir) < 0) {
+               if (claws_unlink(dir) < 0) {
                        FILE_OP_ERROR(dir, "unlink");
                        return -1;
                }
@@ -2391,7 +2500,7 @@ gint remove_dir_recursive(const gchar *dir)
                                return -1;
                        }
                } else {
-                       if (g_unlink(dir_name) < 0)
+                       if (claws_unlink(dir_name) < 0)
                                FILE_OP_ERROR(dir_name, "unlink");
                }
        }
@@ -2422,7 +2531,7 @@ gint rename_force(const gchar *oldpath, const gchar *newpath)
                return -1;
        }
        if (is_file_exist(newpath)) {
-               if (g_unlink(newpath) < 0)
+               if (claws_unlink(newpath) < 0)
                        FILE_OP_ERROR(newpath, "unlink");
        }
 #endif
@@ -2442,12 +2551,12 @@ gint append_file(const gchar *src, const gchar *dest, gboolean keep_backup)
        gboolean err = FALSE;
 
        if ((src_fp = g_fopen(src, "rb")) == NULL) {
-               FILE_OP_ERROR(src, "fopen");
+               FILE_OP_ERROR(src, "g_fopen");
                return -1;
        }
 
        if ((dest_fp = g_fopen(dest, "ab")) == NULL) {
-               FILE_OP_ERROR(dest, "fopen");
+               FILE_OP_ERROR(dest, "g_fopen");
                fclose(src_fp);
                return -1;
        }
@@ -2464,7 +2573,7 @@ gint append_file(const gchar *src, const gchar *dest, gboolean keep_backup)
                        g_warning("writing to %s failed.\n", dest);
                        fclose(dest_fp);
                        fclose(src_fp);
-                       g_unlink(dest);
+                       claws_unlink(dest);
                        return -1;
                }
        }
@@ -2480,7 +2589,7 @@ gint append_file(const gchar *src, const gchar *dest, gboolean keep_backup)
        }
 
        if (err) {
-               g_unlink(dest);
+               claws_unlink(dest);
                return -1;
        }
 
@@ -2496,7 +2605,7 @@ gint copy_file(const gchar *src, const gchar *dest, gboolean keep_backup)
        gboolean err = FALSE;
 
        if ((src_fp = g_fopen(src, "rb")) == NULL) {
-               FILE_OP_ERROR(src, "fopen");
+               FILE_OP_ERROR(src, "g_fopen");
                return -1;
        }
        if (is_file_exist(dest)) {
@@ -2510,7 +2619,7 @@ gint copy_file(const gchar *src, const gchar *dest, gboolean keep_backup)
        }
 
        if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
-               FILE_OP_ERROR(dest, "fopen");
+               FILE_OP_ERROR(dest, "g_fopen");
                fclose(src_fp);
                if (dest_bak) {
                        if (rename_force(dest_bak, dest) < 0)
@@ -2532,7 +2641,7 @@ gint copy_file(const gchar *src, const gchar *dest, gboolean keep_backup)
                        g_warning("writing to %s failed.\n", dest);
                        fclose(dest_fp);
                        fclose(src_fp);
-                       g_unlink(dest);
+                       claws_unlink(dest);
                        if (dest_bak) {
                                if (rename_force(dest_bak, dest) < 0)
                                        FILE_OP_ERROR(dest_bak, "rename");
@@ -2553,7 +2662,7 @@ gint copy_file(const gchar *src, const gchar *dest, gboolean keep_backup)
        }
 
        if (err) {
-               g_unlink(dest);
+               claws_unlink(dest);
                if (dest_bak) {
                        if (rename_force(dest_bak, dest) < 0)
                                FILE_OP_ERROR(dest_bak, "rename");
@@ -2563,7 +2672,7 @@ gint copy_file(const gchar *src, const gchar *dest, gboolean keep_backup)
        }
 
        if (keep_backup == FALSE && dest_bak)
-               g_unlink(dest_bak);
+               claws_unlink(dest_bak);
 
        g_free(dest_bak);
 
@@ -2586,7 +2695,7 @@ gint move_file(const gchar *src, const gchar *dest, gboolean overwrite)
 
        if (copy_file(src, dest, FALSE) < 0) return -1;
 
-       g_unlink(src);
+       claws_unlink(src);
 
        return 0;
 }
@@ -2631,7 +2740,7 @@ gint copy_file_part(FILE *fp, off_t offset, size_t length, const gchar *dest)
        gboolean err = FALSE;
 
        if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
-               FILE_OP_ERROR(dest, "fopen");
+               FILE_OP_ERROR(dest, "g_fopen");
                return -1;
        }
 
@@ -2650,7 +2759,7 @@ gint copy_file_part(FILE *fp, off_t offset, size_t length, const gchar *dest)
 
        if (err) {
                g_warning("writing to %s failed.\n", dest);
-               g_unlink(dest);
+               claws_unlink(dest);
                return -1;
        }
 
@@ -2701,13 +2810,16 @@ gint canonicalize_file(const gchar *src, const gchar *dest)
        gboolean err = FALSE;
        gboolean last_linebreak = FALSE;
 
+       if (src == NULL || dest == NULL)
+               return -1;
+
        if ((src_fp = g_fopen(src, "rb")) == NULL) {
-               FILE_OP_ERROR(src, "fopen");
+               FILE_OP_ERROR(src, "g_fopen");
                return -1;
        }
 
        if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
-               FILE_OP_ERROR(dest, "fopen");
+               FILE_OP_ERROR(dest, "g_fopen");
                fclose(src_fp);
                return -1;
        }
@@ -2743,7 +2855,7 @@ gint canonicalize_file(const gchar *src, const gchar *dest)
                        g_warning("writing to %s failed.\n", dest);
                        fclose(dest_fp);
                        fclose(src_fp);
-                       g_unlink(dest);
+                       claws_unlink(dest);
                        return -1;
                }
        }
@@ -2764,7 +2876,7 @@ gint canonicalize_file(const gchar *src, const gchar *dest)
        }
 
        if (err) {
-               g_unlink(dest);
+               claws_unlink(dest);
                return -1;
        }
 
@@ -2784,7 +2896,7 @@ gint canonicalize_file_replace(const gchar *file)
 
        if (move_file(tmp_file, file, TRUE) < 0) {
                g_warning("can't replace %s .\n", file);
-               g_unlink(tmp_file);
+               claws_unlink(tmp_file);
                g_free(tmp_file);
                return -1;
        }
@@ -2795,7 +2907,7 @@ gint canonicalize_file_replace(const gchar *file)
 
 gchar *normalize_newlines(const gchar *str)
 {
-       const gchar *p = str;
+       const gchar *p;
        gchar *out, *outp;
 
        out = outp = g_malloc(strlen(str) + 1);
@@ -2913,7 +3025,9 @@ FILE *my_tmpfile(void)
        gchar *fname;
        gint fd;
        FILE *fp;
+#ifndef G_OS_WIN32
        gchar buf[2]="\0";
+#endif
 
        tmpdir = get_tmp_dir();
        tmplen = strlen(tmpdir);
@@ -2934,7 +3048,7 @@ FILE *my_tmpfile(void)
                return tmpfile();
 
 #ifndef G_OS_WIN32
-       g_unlink(fname);
+       claws_unlink(fname);
        
        /* verify that we can write in the file after unlinking */
        if (write(fd, buf, 1) < 0) {
@@ -2977,7 +3091,7 @@ FILE *str_open_as_stream(const gchar *str)
        FILE *fp;
        size_t len;
 
-       g_return_val_if_fail(str != NULL, NULL);
+       cm_return_val_if_fail(str != NULL, NULL);
 
        fp = my_tmpfile();
        if (!fp) {
@@ -3003,11 +3117,11 @@ gint str_write_to_file(const gchar *str, const gchar *file)
        FILE *fp;
        size_t len;
 
-       g_return_val_if_fail(str != NULL, -1);
-       g_return_val_if_fail(file != NULL, -1);
+       cm_return_val_if_fail(str != NULL, -1);
+       cm_return_val_if_fail(file != NULL, -1);
 
        if ((fp = g_fopen(file, "wb")) == NULL) {
-               FILE_OP_ERROR(file, "fopen");
+               FILE_OP_ERROR(file, "g_fopen");
                return -1;
        }
 
@@ -3020,13 +3134,13 @@ gint str_write_to_file(const gchar *str, const gchar *file)
        if (fwrite(str, 1, len, fp) != len) {
                FILE_OP_ERROR(file, "fwrite");
                fclose(fp);
-               g_unlink(file);
+               claws_unlink(file);
                return -1;
        }
 
        if (fclose(fp) == EOF) {
                FILE_OP_ERROR(file, "fclose");
-               g_unlink(file);
+               claws_unlink(file);
                return -1;
        }
 
@@ -3040,7 +3154,7 @@ static gchar *file_read_stream_to_str_full(FILE *fp, gboolean recode)
        gint n_read;
        gchar *str;
 
-       g_return_val_if_fail(fp != NULL, NULL);
+       cm_return_val_if_fail(fp != NULL, NULL);
 
        array = g_byte_array_new();
 
@@ -3078,13 +3192,75 @@ static gchar *file_read_to_str_full(const gchar *file, gboolean recode)
 {
        FILE *fp;
        gchar *str;
+       struct stat s;
+#ifndef G_OS_WIN32
+       gint fd, err;
+       struct timeval timeout = {1, 0};
+       fd_set fds;
+       int fflags = 0;
+#endif
 
-       g_return_val_if_fail(file != NULL, NULL);
+       cm_return_val_if_fail(file != NULL, NULL);
 
-       if ((fp = g_fopen(file, "rb")) == NULL) {
-               FILE_OP_ERROR(file, "fopen");
+       if (g_stat(file, &s) != 0) {
+               FILE_OP_ERROR(file, "stat");
                return NULL;
        }
+       if (S_ISDIR(s.st_mode)) {
+               g_warning("%s: is a directory\n", file);
+               return NULL;
+       }
+
+#ifdef G_OS_WIN32
+       fp = g_fopen (file, "rb");
+       if (fp == NULL) {
+               FILE_OP_ERROR(file, "open");
+               return NULL;
+       }
+#else    
+       /* test whether the file is readable without blocking */
+       fd = g_open(file, O_RDONLY | O_NONBLOCK, 0);
+       if (fd == -1) {
+               FILE_OP_ERROR(file, "open");
+               return NULL;
+       }
+
+       FD_ZERO(&fds);
+       FD_SET(fd, &fds);
+
+       /* allow for one second */
+       err = select(fd+1, &fds, NULL, NULL, &timeout);
+       if (err <= 0 || !FD_ISSET(fd, &fds)) {
+               if (err < 0) {
+                       FILE_OP_ERROR(file, "select");
+               } else {
+                       g_warning("%s: doesn't seem readable\n", file);
+               }
+               close(fd);
+               return NULL;
+       }
+       
+       /* Now clear O_NONBLOCK */
+       if ((fflags = fcntl(fd, F_GETFL)) < 0) {
+               FILE_OP_ERROR(file, "fcntl (F_GETFL)");
+               close(fd);
+               return NULL;
+       }
+       if (fcntl(fd, F_SETFL, (fflags & ~O_NONBLOCK)) < 0) {
+               FILE_OP_ERROR(file, "fcntl (F_SETFL)");
+               close(fd);
+               return NULL;
+       }
+       
+       /* get the FILE pointer */
+       fp = fdopen(fd, "rb");
+
+       if (fp == NULL) {
+               FILE_OP_ERROR(file, "fdopen");
+               close(fd); /* if fp isn't NULL, we'll use fclose instead! */
+               return NULL;
+       }
+#endif
 
        str = file_read_stream_to_str_full(fp, recode);
 
@@ -3144,7 +3320,7 @@ char *fgets_crlf(char *buf, int size, FILE *stream)
 
 static gint execute_async(gchar *const argv[])
 {
-       g_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
+       cm_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) {
@@ -3159,20 +3335,27 @@ static gint execute_sync(gchar *const argv[])
 {
        gint status;
 
-       g_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
+       cm_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
 
+#ifdef G_OS_UNIX
        if (g_spawn_sync(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH,
                         NULL, NULL, NULL, NULL, &status, NULL) == FALSE) {
                g_warning("Couldn't execute command: %s\n", argv[0]);
                return -1;
        }
 
-#ifdef G_OS_UNIX
        if (WIFEXITED(status))
                return WEXITSTATUS(status);
        else
                return -1;
 #else
+       if (g_spawn_sync(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH| 
+                        G_SPAWN_CHILD_INHERITS_STDIN|G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
+                        NULL, NULL, NULL, NULL, &status, NULL) == FALSE) {
+               g_warning("Couldn't execute command: %s\n", argv[0]);
+               return -1;
+       }
+
        return status;
 #endif
 }
@@ -3201,7 +3384,7 @@ gchar *get_command_output(const gchar *cmdline)
        gchar *child_stdout;
        gint status;
 
-       g_return_val_if_fail(cmdline != NULL, NULL);
+       cm_return_val_if_fail(cmdline != NULL, NULL);
 
        debug_print("get_command_output(): executing: %s\n", cmdline);
 
@@ -3213,7 +3396,7 @@ gchar *get_command_output(const gchar *cmdline)
 
        return child_stdout;
 }
-#ifndef MAEMO
+
 static gint is_unchanged_uri_char(char c)
 {
        switch (c) {
@@ -3249,14 +3432,15 @@ static 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
+
+#ifndef G_OS_WIN32
        gchar buf[BUFFSIZE];
        gchar *p;
        gchar encoded_uri[BUFFSIZE];
-       g_return_val_if_fail(uri != NULL, -1);
+       cm_return_val_if_fail(uri != NULL, -1);
 
        /* an option to choose whether to use encode_uri or not ? */
        encode_uri(encoded_uri, BUFFSIZE, uri);
@@ -3267,7 +3451,7 @@ gint open_uri(const gchar *uri, const gchar *cmdline)
                g_snprintf(buf, sizeof(buf), cmdline, encoded_uri);
        else {
                if (cmdline)
-                       g_warning("Open URI command line is invalid "
+                       g_warning("Open URI command-line is invalid "
                                  "(there must be only one '%%s'): %s",
                                  cmdline);
                g_snprintf(buf, sizeof(buf), DEFAULT_BROWSER_CMD, encoded_uri);
@@ -3275,10 +3459,7 @@ 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);
+       ShellExecute(NULL, "open", uri, NULL, NULL, SW_SHOW);
 #endif
        return 0;
 }
@@ -3288,7 +3469,7 @@ gint open_txt_editor(const gchar *filepath, const gchar *cmdline)
        gchar buf[BUFFSIZE];
        gchar *p;
 
-       g_return_val_if_fail(filepath != NULL, -1);
+       cm_return_val_if_fail(filepath != NULL, -1);
 
        if (cmdline &&
            (p = strchr(cmdline, '%')) && *(p + 1) == 's' &&
@@ -3296,7 +3477,7 @@ gint open_txt_editor(const gchar *filepath, const gchar *cmdline)
                g_snprintf(buf, sizeof(buf), cmdline, filepath);
        else {
                if (cmdline)
-                       g_warning("Open Text Editor command line is invalid "
+                       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);
@@ -3380,7 +3561,10 @@ time_t tzoffset_sec(time_t *now)
        struct tm gmt, *lt;
        gint off;
        struct tm buf1, buf2;
-       
+#ifdef G_OS_WIN32
+       if (now && *now < 0)
+               return 0;
+#endif 
        gmt = *gmtime_r(now, &buf1);
        lt = localtime_r(now, &buf2);
 
@@ -3411,7 +3595,10 @@ gchar *tzoffset(time_t *now)
        gint off;
        gchar sign = '+';
        struct tm buf1, buf2;
-
+#ifdef G_OS_WIN32
+       if (now && *now < 0)
+               return 0;
+#endif
        gmt = *gmtime_r(now, &buf1);
        lt = localtime_r(now, &buf2);
 
@@ -3518,30 +3705,35 @@ void subject_table_remove(GHashTable *subject_table, gchar * 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
- *             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
- *             for a "clean" subject line. If no prefix was found, 0
- *             is returned.
- */
+#ifndef G_OS_WIN32
 static regex_t u_regex;
 static gboolean u_init_;
+#endif
 
 void utils_free_regex(void)
 {
+#ifndef G_OS_WIN32
        if (u_init_) {
                regfree(&u_regex);
                u_init_ = FALSE;
        }
+#endif
 }
 
+/*!
+ *\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
+ *             for a "clean" subject line. If no prefix was found, 0
+ *             is returned.
+ */
 int subject_get_prefix_length(const gchar *subject)
 {
+#ifndef G_OS_WIN32
        /*!< Array with allowable reply prefixes regexps. */
        static const gchar * const prefixes[] = {
                "Re\\:",                        /* "Re:" */
@@ -3549,15 +3741,18 @@ int subject_get_prefix_length(const gchar *subject)
                "Antw\\:",                      /* "Antw:" (Dutch / German Outlook) */
                "Aw\\:",                        /* "Aw:"   (German) */
                "Antwort\\:",                   /* "Antwort:" (German Lotus Notes) */
-               "Res\\:",                       /* "Res:" (Brazilian Outlook) */
+               "Res\\:",                       /* "Res:" (Spanish/Brazilian Outlook) */
                "Fw\\:",                        /* "Fw:" Forward */
+               "Fwd\\:",                       /* "Fwd:" Forward */
                "Enc\\:",                       /* "Enc:" Forward (Brazilian Outlook) */
                "Odp\\:",                       /* "Odp:" Re (Polish Outlook) */
                "Rif\\:",                       /* "Rif:" (Italian Outlook) */
                "Sv\\:",                        /* "Sv" (Norwegian) */
                "Vs\\:",                        /* "Vs" (Norwegian) */
                "Ad\\:",                        /* "Ad" (Norwegian) */
-               "\347\255\224\345\244\215\\:"   /* "Re" (Chinese, UTF-8) */
+               "\347\255\224\345\244\215\\:",  /* "Re" (Chinese, UTF-8) */
+               "R\303\251f\\. \\:",            /* "R�f. :" (French Lotus Notes) */
+               "Re \\:",                       /* "Re :" (French Yahoo Mail) */
                /* add more */
        };
        const int PREFIXES = sizeof prefixes / sizeof prefixes[0];
@@ -3599,8 +3794,44 @@ int subject_get_prefix_length(const gchar *subject)
                return pos.rm_eo;
        else
                return 0;
-}
+#else
+       /*!< Array with allowable reply prefixes regexps. */
+       static const gchar * const prefixes[] = {
+               "re:",                  /* "Re:" */
+               "antw:",                        /* "Antw:" (Dutch / German Outlook) */
+               "aw:",                  /* "Aw:"   (German) */
+               "antwort:",                     /* "Antwort:" (German Lotus Notes) */
+               "res:",                 /* "Res:" (Spanish/Brazilian Outlook) */
+               "fw:",                  /* "Fw:" Forward */
+               "fwd:",                 /* "Fwd:" Forward */
+               "enc:",                 /* "Enc:" Forward (Brazilian Outlook) */
+               "odp:",                 /* "Odp:" Re (Polish Outlook) */
+               "rif:",                 /* "Rif:" (Italian Outlook) */
+               "sv:",                  /* "Sv" (Norwegian) */
+               "vs:",                  /* "Vs" (Norwegian) */
+               "ad:",                  /* "Ad" (Norwegian) */
+               "R\303\251f. :",        /* "R�f. :" (French Lotus Notes) */
+               "Re :",                 /* "Re :" (French Yahoo Mail) */
+               /* add more */
+       };
+       const int PREFIXES = sizeof prefixes / sizeof prefixes[0];
+       int n;
 
+       if (!subject) return 0;
+       if (!*subject) return 0;
+
+       for (n = 0; n < PREFIXES; n++) {
+               int len = strlen(prefixes[n]);
+               if (!strncasecmp(subject, prefixes[n], len)) {
+                       if (subject[len] == ' ')
+                               return len+1;
+                       else
+                               return len;
+               }
+       }
+       return 0;
+#endif
+}
 static guint g_stricase_hash(gconstpointer gptr)
 {
        guint hash_result = 0;
@@ -3626,7 +3857,7 @@ gint g_int_compare(gconstpointer a, gconstpointer b)
        return GPOINTER_TO_INT(a) - GPOINTER_TO_INT(b);
 }
 
-gchar *generate_msgid(gchar *buf, gint len)
+gchar *generate_msgid(gchar *buf, gint len, gchar *user_addr)
 {
        struct tm *lt;
        time_t t;
@@ -3636,12 +3867,18 @@ gchar *generate_msgid(gchar *buf, gint len)
        t = time(NULL);
        lt = localtime_r(&t, &buft);
 
-       if (strcmp(buf, "") == 0) {
-               addr = g_strconcat("@", get_domain_name(), NULL);
-       }
-       else {
-               addr = g_strconcat("@", buf, NULL);
-       }
+       if (user_addr != NULL)
+             addr = g_strdup_printf(".%s", user_addr);
+       else if (strlen(buf) != 0)
+             addr = g_strdup_printf("@%s", buf);
+       else
+             addr = g_strdup_printf("@%s", get_domain_name());
+
+       /* Replace all @ but the last one in addr, with underscores.
+        * RFC 2822 States that msg-id syntax only allows one @.
+        */
+       while (strchr(addr, '@') != NULL && strchr(addr, '@') != strrchr(addr, '@'))
+               *(strchr(addr, '@')) = '_';
 
        g_snprintf(buf, len, "%04d%02d%02d%02d%02d%02d.%08x%s",
                   lt->tm_year + 1900, lt->tm_mon + 1,
@@ -3658,7 +3895,7 @@ gchar *generate_msgid(gchar *buf, gint len)
 
    return a quoted string safely usable in argument of a command.
 
-   code is extracted and adapted from etPan! project -- DINH V. Hoà.
+   code is extracted and adapted from etPan! project -- DINH V. Ho�.
 */
 
 gint quote_cmd_argument(gchar * result, guint size,
@@ -3741,8 +3978,8 @@ GNode *g_node_map(GNode *node, GNodeMapFunc func, gpointer data)
        GNode *root;
        GNodeMapData mapdata;
 
-       g_return_val_if_fail(node != NULL, NULL);
-       g_return_val_if_fail(func != NULL, NULL);
+       cm_return_val_if_fail(node != NULL, NULL);
+       cm_return_val_if_fail(func != NULL, NULL);
 
        root = g_node_new(func(node->data, data));
 
@@ -3799,7 +4036,7 @@ void get_hex_str(gchar *out, guchar ch)
        INT_TO_HEX(hex, ch >> 4);
        *out++ = hex;
        INT_TO_HEX(hex, ch & 0x0f);
-       *out++ = hex;
+       *out   = hex;
 }
 
 #undef REF_DEBUG
@@ -4019,10 +4256,10 @@ gboolean get_uri_part(const gchar *start, const gchar *scanpos,
        const gchar *ep_;
        gint parenthese_cnt = 0;
 
-       g_return_val_if_fail(start != NULL, FALSE);
-       g_return_val_if_fail(scanpos != NULL, FALSE);
-       g_return_val_if_fail(bp != NULL, FALSE);
-       g_return_val_if_fail(ep != NULL, FALSE);
+       cm_return_val_if_fail(start != NULL, FALSE);
+       cm_return_val_if_fail(scanpos != NULL, FALSE);
+       cm_return_val_if_fail(bp != NULL, FALSE);
+       cm_return_val_if_fail(ep != NULL, FALSE);
 
        *bp = scanpos;
 
@@ -4048,7 +4285,7 @@ gboolean get_uri_part(const gchar *start, const gchar *scanpos,
         * should pass some URI type to this function and decide on that whether
         * to perform punctuation stripping */
 
-#define IS_REAL_PUNCT(ch)      (g_ascii_ispunct(ch) && !strchr("/?=-)", ch))
+#define IS_REAL_PUNCT(ch)      (g_ascii_ispunct(ch) && !strchr("/?=-_)", ch))
 
        for (; ep_ - 1 > scanpos + 1 &&
               IS_REAL_PUNCT(*(ep_ - 1));
@@ -4115,7 +4352,7 @@ static GHashTable *create_domain_tab(void)
        gint n;
        GHashTable *htab = g_hash_table_new(g_stricase_hash, g_stricase_equal);
 
-       g_return_val_if_fail(htab, NULL);
+       cm_return_val_if_fail(htab, NULL);
        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;
@@ -4158,10 +4395,10 @@ gboolean get_email_part(const gchar *start, const gchar *scanpos,
        gchar closure_stack[128];
        gchar *ptr = closure_stack;
 
-       g_return_val_if_fail(start != NULL, FALSE);
-       g_return_val_if_fail(scanpos != NULL, FALSE);
-       g_return_val_if_fail(bp != NULL, FALSE);
-       g_return_val_if_fail(ep != NULL, FALSE);
+       cm_return_val_if_fail(start != NULL, FALSE);
+       cm_return_val_if_fail(scanpos != NULL, FALSE);
+       cm_return_val_if_fail(bp != NULL, FALSE);
+       cm_return_val_if_fail(ep != NULL, FALSE);
 
        if (hdr) {
                const gchar *start_quote = NULL;
@@ -4227,7 +4464,7 @@ search_again:
 
        if (!dom_tab)
                dom_tab = create_domain_tab();
-       g_return_val_if_fail(dom_tab, FALSE);
+       cm_return_val_if_fail(dom_tab, FALSE);
 
        /* scan start of address */
        for (bp_ = scanpos - 1;
@@ -4329,7 +4566,7 @@ search_again:
                        POP_STACK();
                        continue;
                }
-               if (*bp_ == '\'' || *bp_ == '"') {
+               if (!IN_STACK() && (*bp_ == '\'' || *bp_ == '"')) {
                        PUSH_STACK(*bp_);
                        continue;
                }
@@ -4406,7 +4643,7 @@ gchar *make_http_string(const gchar *bp, const gchar *ep)
 
 static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type, const gchar *file_to_open)
 {
-       FILE *fp = fopen(path, "rb");
+       FILE *fp = g_fopen(path, "rb");
        gchar buf[BUFFSIZE];
        gchar *result = NULL;
        if (!fp)
@@ -4519,8 +4756,8 @@ 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");
+       FILE *fp = g_fopen(path, "rb");
+       FILE *outfp = g_fopen(outpath, "wb");
        gchar buf[BUFFSIZE];
        gboolean err = FALSE;
 
@@ -4635,9 +4872,11 @@ gboolean file_is_email (const gchar *filename)
               && fgets(buffer, sizeof (buffer), fp) > 0) {
                if (!strncmp(buffer, "From:", strlen("From:")))
                        score++;
-               if (!strncmp(buffer, "To:", strlen("To:")))
+               else if (!strncmp(buffer, "Date:", strlen("Date:")))
                        score++;
-               if (!strncmp(buffer, "Subject:", strlen("Subject:")))
+               else if (!strncmp(buffer, "Message-ID:", strlen("Message-ID:")))
+                       score++;
+               else if (!strncmp(buffer, "Subject:", strlen("Subject:")))
                        score++;
                i++;
        }
@@ -4673,10 +4912,23 @@ const gchar *monthnames[] = {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};
+
+gint daynames_len[] =     {0,0,0,0,0,0,0};
+gint monthnames_len[] =   {0,0,0,0,0,0,
+                                0,0,0,0,0,0};
+gint s_daynames_len[] =   {0,0,0,0,0,0,0};
+gint s_monthnames_len[] = {0,0,0,0,0,0,
+                                0,0,0,0,0,0};
 const gchar *s_am_up = NULL;
 const gchar *s_pm_up = NULL;
 const gchar *s_am_low = NULL;
 const gchar *s_pm_low = NULL;
+
+gint s_am_up_len = 0;
+gint s_pm_up_len = 0;
+gint s_am_low_len = 0;
+gint s_pm_low_len = 0;
+
 const gchar *def_loc_format = NULL;
 const gchar *date_loc_format = NULL;
 const gchar *time_loc_format = NULL;
@@ -4686,58 +4938,74 @@ 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");
+       int i = 0;
+
+       daynames[0] = C_("Complete day name for use by strftime", "Sunday");
+       daynames[1] = C_("Complete day name for use by strftime", "Monday");
+       daynames[2] = C_("Complete day name for use by strftime", "Tuesday");
+       daynames[3] = C_("Complete day name for use by strftime", "Wednesday");
+       daynames[4] = C_("Complete day name for use by strftime", "Thursday");
+       daynames[5] = C_("Complete day name for use by strftime", "Friday");
+       daynames[6] = C_("Complete day name for use by strftime", "Saturday");
+
+       monthnames[0] = C_("Complete month name for use by strftime", "January");
+       monthnames[1] = C_("Complete month name for use by strftime", "February");
+       monthnames[2] = C_("Complete month name for use by strftime", "March");
+       monthnames[3] = C_("Complete month name for use by strftime", "April");
+       monthnames[4] = C_("Complete month name for use by strftime", "May");
+       monthnames[5] = C_("Complete month name for use by strftime", "June");
+       monthnames[6] = C_("Complete month name for use by strftime", "July");
+       monthnames[7] = C_("Complete month name for use by strftime", "August");
+       monthnames[8] = C_("Complete month name for use by strftime", "September");
+       monthnames[9] = C_("Complete month name for use by strftime", "October");
+       monthnames[10] = C_("Complete month name for use by strftime", "November");
+       monthnames[11] = C_("Complete month name for use by strftime", "December");
+
+       s_daynames[0] = C_("Abbr. day name for use by strftime", "Sun");
+       s_daynames[1] = C_("Abbr. day name for use by strftime", "Mon");
+       s_daynames[2] = C_("Abbr. day name for use by strftime", "Tue");
+       s_daynames[3] = C_("Abbr. day name for use by strftime", "Wed");
+       s_daynames[4] = C_("Abbr. day name for use by strftime", "Thu");
+       s_daynames[5] = C_("Abbr. day name for use by strftime", "Fri");
+       s_daynames[6] = C_("Abbr. day name for use by strftime", "Sat");
        
-       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] = C_("Abbr. month name for use by strftime", "Jan");
+       s_monthnames[1] = C_("Abbr. month name for use by strftime", "Feb");
+       s_monthnames[2] = C_("Abbr. month name for use by strftime", "Mar");
+       s_monthnames[3] = C_("Abbr. month name for use by strftime", "Apr");
+       s_monthnames[4] = C_("Abbr. month name for use by strftime", "May");
+       s_monthnames[5] = C_("Abbr. month name for use by strftime", "Jun");
+       s_monthnames[6] = C_("Abbr. month name for use by strftime", "Jul");
+       s_monthnames[7] = C_("Abbr. month name for use by strftime", "Aug");
+       s_monthnames[8] = C_("Abbr. month name for use by strftime", "Sep");
+       s_monthnames[9] = C_("Abbr. month name for use by strftime", "Oct");
+       s_monthnames[10] = C_("Abbr. month name for use by strftime", "Nov");
+       s_monthnames[11] = C_("Abbr. month name for use by strftime", "Dec");
+
+       for (i = 0; i < 7; i++) {
+               daynames_len[i] = strlen(daynames[i]);
+               s_daynames_len[i] = strlen(s_daynames[i]);
+       }
+       for (i = 0; i < 12; i++) {
+               monthnames_len[i] = strlen(monthnames[i]);
+               s_monthnames_len[i] = strlen(s_monthnames[i]);
+       }
+
+       s_am_up = C_("For use by strftime (morning)", "AM");
+       s_pm_up = C_("For use by strftime (afternoon)", "PM");
+       s_am_low = C_("For use by strftime (morning, lowercase)", "am");
+       s_pm_low = C_("For use by strftime (afternoon, lowercase)", "pm");
        
-       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");
+       s_am_up_len = strlen(s_am_up);
+       s_pm_up_len = strlen(s_pm_up);
+       s_am_low_len = strlen(s_am_low);
+       s_pm_low_len = strlen(s_pm_low);
        
-       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");
+       def_loc_format = C_("For use by strftime (default date+time format)", "%a %b %e %H:%M:%S %Y");
+       date_loc_format = C_("For use by strftime (default date format)", "%m/%d/%y");
+       time_loc_format = C_("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_am_pm = C_("For use by strftime (default 12-hour time format)", "%I:%M:%S %p");
 
        time_names_init_done = TRUE;
 }
@@ -4777,20 +5045,20 @@ size_t fast_strftime(gchar *buf, gint buflen, const gchar *format, struct tm *lt
                                *curpos = '%';
                                break;
                        case 'a':
-                               len = strlen(s_daynames[lt->tm_wday]); CHECK_SIZE();
+                               len = s_daynames_len[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();
+                               len = daynames_len[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();
+                               len = s_monthnames_len[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();
+                               len = monthnames_len[lt->tm_mon]; CHECK_SIZE();
                                strncpy2(curpos, monthnames[lt->tm_mon], buflen - total_done);
                                break;
                        case 'c':
@@ -4879,20 +5147,20 @@ size_t fast_strftime(gchar *buf, gint buflen, const gchar *format, struct tm *lt
                                break;
                        case 'p':
                                if (lt->tm_hour >= 12) {
-                                       len = strlen(s_pm_up); CHECK_SIZE();
-                                       snprintf(curpos, buflen-total_done, s_pm_up);
+                                       len = s_pm_up_len; CHECK_SIZE();
+                                       snprintf(curpos, buflen-total_done, "%s", s_pm_up);
                                } else {
-                                       len = strlen(s_am_up); CHECK_SIZE();
-                                       snprintf(curpos, buflen-total_done, s_am_up);
+                                       len = s_am_up_len; CHECK_SIZE();
+                                       snprintf(curpos, buflen-total_done, "%s", 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);
+                                       len = s_pm_low_len; CHECK_SIZE();
+                                       snprintf(curpos, buflen-total_done, "%s", s_pm_low);
                                } else {
-                                       len = strlen(s_am_low); CHECK_SIZE();
-                                       snprintf(curpos, buflen-total_done, s_am_low);
+                                       len = s_am_low_len; CHECK_SIZE();
+                                       snprintf(curpos, buflen-total_done, "%s", s_am_low);
                                }
                                break;
                        case 'r':
@@ -4909,7 +5177,7 @@ size_t fast_strftime(gchar *buf, gint buflen, const gchar *format, struct tm *lt
                                *curpos++ = '0'+(lt->tm_min % 10);
                                break;
                        case 's':
-                               snprintf(subbuf, buflen - total_done, "%ld", mktime(lt));
+                               snprintf(subbuf, 64, "%ld", mktime(lt));
                                len = strlen(subbuf); CHECK_SIZE();
                                strncpy2(curpos, subbuf, buflen - total_done);
                                break;
@@ -4985,7 +5253,8 @@ size_t fast_strftime(gchar *buf, gint buflen, const gchar *format, struct tm *lt
                                format++;
                                break;
                        default:
-                               g_warning("format error (%c)", *format);
+                               if (format && *format)
+                                       g_warning("format error (%c)", *format);
                                *curpos = '\0';
                                return total_done;
                        }
@@ -4996,6 +5265,237 @@ size_t fast_strftime(gchar *buf, gint buflen, const gchar *format, struct tm *lt
                        *curpos++ = *format++; 
                }
        }
-       *curpos++ = '\0';
+       *curpos = '\0';
        return total_done;
 }
+
+gboolean prefs_common_get_use_shred(void);
+
+
+#ifdef G_OS_WIN32
+#define WEXITSTATUS(x) (x)
+#endif
+
+int claws_unlink(const gchar *filename) 
+{
+       struct stat s;
+       static int found_shred = -1;
+       static const gchar *args[4];
+
+       if (filename == NULL)
+               return 0;
+
+       if (prefs_common_get_use_shred()) {
+               if (found_shred == -1) {
+                       /* init */
+                       args[0] = g_find_program_in_path("shred");
+                       debug_print("found shred: %s\n", args[0]);
+                       found_shred = (args[0] != NULL) ? 1:0;
+                       args[1] = "-f";
+                       args[3] = NULL;
+               }
+               if (found_shred == 1) {
+                       if (g_stat(filename, &s) == 0 && S_ISREG(s.st_mode)) {
+                               if (s.st_nlink == 1) {
+                                       gint status=0;
+                                       args[2] = filename;
+                                       g_spawn_sync(NULL, (gchar **)args, NULL, 0,
+                                        NULL, NULL, NULL, NULL, &status, NULL);
+                                       debug_print("%s %s exited with status %d\n",
+                                               args[0], filename, WEXITSTATUS(status));
+                                       if (truncate(filename, 0) < 0)
+                                               g_warning("couln't truncate");
+                               }
+                       }
+               }
+       }
+       return g_unlink(filename);
+}
+
+GMutex *cm_mutex_new(void) {
+#if GLIB_CHECK_VERSION(2,32,0)
+       GMutex *m = g_new0(GMutex, 1);
+       g_mutex_init(m);
+       return m;
+#else
+       return g_mutex_new();
+#endif
+}
+
+void cm_mutex_free(GMutex *mutex) {
+#if GLIB_CHECK_VERSION(2,32,0)
+       g_mutex_clear(mutex);
+       g_free(mutex);
+#else
+       g_mutex_free(mutex);
+#endif
+}
+
+static gchar *canonical_list_to_file(GSList *list)
+{
+       GString *result = g_string_new(NULL);
+       GSList *pathlist = g_slist_reverse(g_slist_copy(list));
+       GSList *cur;
+       gchar *str;
+
+#ifndef G_OS_WIN32
+       result = g_string_append(result, G_DIR_SEPARATOR_S);
+#else
+       if (pathlist->data) {
+               const gchar *root = (gchar *)pathlist->data;
+               if (root[0] != '\0' && g_ascii_isalpha(root[0]) &&
+                   root[1] == ':') {
+                       /* drive - don't prepend dir separator */
+               } else {
+                       result = g_string_append(result, G_DIR_SEPARATOR_S);
+               }
+       }
+#endif
+
+       for (cur = pathlist; cur; cur = cur->next) {
+               result = g_string_append(result, (gchar *)cur->data);
+               if (cur->next)
+                       result = g_string_append(result, G_DIR_SEPARATOR_S);
+       }
+       g_slist_free(pathlist);
+
+       str = result->str;
+       g_string_free(result, FALSE);
+
+       return str;
+}
+
+static GSList *cm_split_path(const gchar *filename, int depth)
+{
+       gchar **path_parts;
+       GSList *canonical_parts = NULL;
+       struct stat st;
+       int i;
+       gboolean follow_symlinks = TRUE;
+
+       if (depth > 32) {
+#ifndef G_OS_WIN32
+               errno = ELOOP;
+#else
+               errno = EINVAL; /* can't happen, no symlink handling */
+#endif
+               return NULL;
+       }
+
+       if (!g_path_is_absolute(filename)) {
+               errno =EINVAL;
+               return NULL;
+       }
+
+       path_parts = g_strsplit(filename, G_DIR_SEPARATOR_S, -1);
+
+       for (i = 0; path_parts[i] != NULL; i++) {
+               if (!strcmp(path_parts[i], ""))
+                       continue;
+               if (!strcmp(path_parts[i], "."))
+                       continue;
+               else if (!strcmp(path_parts[i], "..")) {
+                       if (i == 0) {
+                               errno =ENOTDIR;
+                               return NULL;
+                       }
+                       else /* Remove the last inserted element */
+                               canonical_parts = 
+                                       g_slist_delete_link(canonical_parts,
+                                                           canonical_parts);
+               } else {
+                       gchar *tmp_path;
+
+                       canonical_parts = g_slist_prepend(canonical_parts,
+                                               g_strdup(path_parts[i]));
+
+                       tmp_path = canonical_list_to_file(canonical_parts);
+
+                       if(g_stat(tmp_path, &st) < 0) {
+                               if (errno == ENOENT) {
+                                       errno = 0;
+                                       follow_symlinks = FALSE;
+                               }
+                               if (errno != 0) {
+                                       g_free(tmp_path);
+                                       slist_free_strings_full(canonical_parts);
+                                       g_strfreev(path_parts);
+
+                                       return NULL;
+                               }
+                       }
+#ifndef G_OS_WIN32
+                       if (follow_symlinks && g_file_test(tmp_path, G_FILE_TEST_IS_SYMLINK)) {
+                               GError *error = NULL;
+                               gchar *target = g_file_read_link(tmp_path, &error);
+
+                               if (!g_path_is_absolute(target)) {
+                                       /* remove the last inserted element */
+                                       canonical_parts = 
+                                               g_slist_delete_link(canonical_parts,
+                                                           canonical_parts);
+                                       /* add the target */
+                                       canonical_parts = g_slist_prepend(canonical_parts,
+                                               g_strdup(target));
+                                       g_free(target);
+
+                                       /* and get the new target */
+                                       target = canonical_list_to_file(canonical_parts);
+                               }
+
+                               /* restart from absolute target */
+                               slist_free_strings_full(canonical_parts);
+                               canonical_parts = NULL;
+                               if (!error)
+                                       canonical_parts = cm_split_path(target, depth + 1);
+                               else
+                                       g_error_free(error);
+                               if (canonical_parts == NULL) {
+                                       g_free(tmp_path);
+                                       g_strfreev(path_parts);
+                                       return NULL;
+                               }
+                               g_free(target);
+                       }
+#endif
+                       g_free(tmp_path);
+               }
+       }
+       g_strfreev(path_parts);
+       return canonical_parts;
+}
+
+/*
+ * Canonicalize a filename, resolving symlinks along the way.
+ * Returns a negative errno in case of error.
+ */
+int cm_canonicalize_filename(const gchar *filename, gchar **canonical_name) {
+       GSList *canonical_parts;
+       gboolean is_absolute;
+
+       if (filename == NULL)
+               return -EINVAL;
+       if (canonical_name == NULL)
+               return -EINVAL;
+       *canonical_name = NULL;
+
+       is_absolute = g_path_is_absolute(filename);
+       if (!is_absolute) {
+               /* Always work on absolute filenames. */
+               gchar *cur = g_get_current_dir();
+               gchar *absolute_filename = g_strconcat(cur, G_DIR_SEPARATOR_S,
+                                                      filename, NULL);
+               
+               canonical_parts = cm_split_path(absolute_filename, 0);
+               g_free(absolute_filename);
+               g_free(cur);
+       } else
+               canonical_parts = cm_split_path(filename, 0);
+
+       if (canonical_parts == NULL)
+               return -errno;
+
+       *canonical_name = canonical_list_to_file(canonical_parts);
+       slist_free_strings_full(canonical_parts);
+       return 0;
+}