Provide an up to date version of g_base64_decode() for older GLib.
[claws.git] / src / common / utils.c
index 2dccd111f810c1e1727a86fb9a7536da3d691704..64ca25a8aec780837108a6bf1b307d3564d8c02b 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto & The Claws Mail Team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2015 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
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
+ * The code of the g_utf8_substring function below is owned by
+ * Matthias Clasen <matthiasc@src.gnome.org>/<mclasen@redhat.com>
+ * and is got from GLIB 2.30: https://git.gnome.org/browse/glib/commit/
+ *  ?h=glib-2-30&id=9eb65dd3ed5e1a9638595cbe10699c7606376511
+ *
+ * GLib 2.30 is licensed under GPL v2 or later and:
+ * Copyright (C) 1999 Tom Tromey
+ * Copyright (C) 2000 Red Hat, Inc.
+ *
+ * https://git.gnome.org/browse/glib/tree/glib/gutf8.c
+ *  ?h=glib-2-30&id=9eb65dd3ed5e1a9638595cbe10699c7606376511
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
 
 #include <glib.h>
+#include <gio/gio.h>
 
 #include <glib/gi18n.h>
 
+#ifdef USE_PTHREAD
+#include <pthread.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.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"
@@ -81,165 +89,49 @@ static gboolean debug_mode = FALSE;
 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)
-gint g_chdir(const gchar *path)
+#if !GLIB_CHECK_VERSION(2, 26, 0)
+guchar *g_base64_decode_wa(const gchar *text, gsize *out_len)
 {
-#ifdef G_OS_WIN32
-       if (G_WIN32_HAVE_WIDECHAR_API()) {
-               wchar_t *wpath;
-               gint retval;
-               gint save_errno;
-
-               wpath = g_utf8_to_utf16(path, -1, NULL, NULL, NULL);
-               if (wpath == NULL) {
-                       errno = EINVAL;
-                       return -1;
-               }
-
-               retval = _wchdir(wpath);
-               save_errno = errno;
+       guchar *ret;
+       gsize input_length;
+       gint state = 0;
+       guint save = 0;
 
-               g_free(wpath);
+       input_length = strlen(text);
 
-               errno = save_errno;
-               return retval;
-       } else {
-               gchar *cp_path;
-               gint retval;
-               gint save_errno;
+       ret = g_malloc0((input_length / 4) * 3 + 1);
 
-               cp_path = g_locale_from_utf8(path, -1, NULL, NULL, NULL);
-               if (cp_path == NULL) {
-                       errno = EINVAL;
-                       return -1;
-               }
+       *out_len = g_base64_decode_step(text, input_length, ret, &state, &save);
 
-               retval = chdir(cp_path);
-               save_errno = errno;
-
-               g_free(cp_path);
-
-               errno = save_errno;
-               return retval;
-       }
-#else
-       return chdir(path);
-#endif
+       return ret;
 }
-
-gint g_chmod(const gchar *path, gint mode)
-{
-#ifdef G_OS_WIN32
-       if (G_WIN32_HAVE_WIDECHAR_API()) {
-               wchar_t *wpath;
-               gint retval;
-               gint save_errno;
-
-               wpath = g_utf8_to_utf16(path, -1, NULL, NULL, NULL);
-               if (wpath == NULL) {
-                       errno = EINVAL;
-                       return -1;
-               }
-
-               retval = _wchmod(wpath, mode);
-               save_errno = errno;
-
-               g_free(wpath);
-
-               errno = save_errno;
-               return retval;
-       } else {
-               gchar *cp_path;
-               gint retval;
-               gint save_errno;
-
-               cp_path = g_locale_from_utf8(path, -1, NULL, NULL, NULL);
-               if (cp_path == NULL) {
-                       errno = EINVAL;
-                       return -1;
-               }
-
-               retval = chmod(cp_path, mode);
-               save_errno = errno;
-
-               g_free(cp_path);
-
-               errno = save_errno;
-               return retval;
-       }
-#else
-       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)
+/* Return true if we are running as root.  This function should beused
+   instead of getuid () == 0.  */
+gboolean superuser_p (void)
 {
 #ifdef G_OS_WIN32
-       char *name = g_win32_locale_filename_from_utf8(filename);
-       int fd = open(name, flags, mode);
-       g_free(name);
-       return fp;
+  return w32_is_administrator ();
 #else
-       return open(filename, flags, mode);
-#endif
+  return !getuid();
+#endif  
 }
-#endif /* GLIB_CHECK_VERSION && G_OS_UNIX */
 
-
-#ifdef G_OS_WIN32
-gint mkstemp_name(gchar *template, gchar **name_used)
+GSList *slist_copy_deep(GSList *list, GCopyFunc func)
 {
-       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 = g_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;
+#if GLIB_CHECK_VERSION(2, 34, 0)
+       return g_slist_copy_deep(list, func, NULL);
+#else
+       GSList *res = g_slist_copy(list);
+       GSList *walk = res;
+       while (walk) {
+               walk->data = func(walk->data, NULL);
+               walk = walk->next;
        }
-       else
-               return tmpfd;
-}
-#endif /* G_OS_WIN32 */
-
-#ifdef G_OS_WIN32
-gint mkstemp(gchar *template)
-{
-       gchar *dummyname;
-       gint res = mkstemp_name(template, &dummyname);
-       g_free(dummyname);
        return res;
+#endif
 }
-#endif /* G_OS_WIN32 */
 
 void list_free_strings(GList *list)
 {
@@ -259,6 +151,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);
@@ -301,16 +203,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;
@@ -526,9 +418,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)
@@ -711,7 +609,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;
@@ -735,7 +633,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)
@@ -764,7 +662,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)
@@ -805,12 +703,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, '"'))) {
@@ -827,7 +766,7 @@ void eliminate_address_comment(gchar *str)
                }
        }
 
-       srcp = destp = str;
+       destp = str;
 
        while ((destp = strchr_with_skip_quote(destp, '"', '('))) {
                in_brace = 1;
@@ -863,6 +802,7 @@ gchar *strchr_with_skip_quote(const gchar *str, gint quote_chr, gint c)
 
 void extract_address(gchar *str)
 {
+       cm_return_if_fail(str != NULL);
        eliminate_address_comment(str);
        if (strchr_with_skip_quote(str, '"', '<'))
                extract_parenthesis_with_skip_quote(str, '"', '<', '>');
@@ -997,20 +937,23 @@ GSList *newsgroup_list_append(GSList *group_list, const gchar *str)
 GList *add_history(GList *list, const gchar *str)
 {
        GList *old;
+       gchar *oldstr;
 
        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);
                }
        }
 
@@ -1128,7 +1071,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]);
@@ -1256,6 +1199,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++;
@@ -1424,7 +1370,7 @@ GList *uri_list_extract_filenames(const gchar *uri_list)
                                        if (!locale_file)
                                                locale_file = g_strdup(file + 5);
 #else
-                                       locale_file = g_filename_from_uri(file, NULL, NULL);
+                                       locale_file = g_filename_from_uri(escaped_utf8uri, NULL, NULL);
 #endif
                                        result = g_list_append(result, locale_file);
                                }
@@ -1636,7 +1582,7 @@ gint scan_mailto_url(const gchar *mailto, gchar **from, gchar **to, gchar **cc,
                } else if (body && !*body && !g_ascii_strcasecmp(field, "insert")) {
                        gchar *tmp = decode_uri_gdup(value);
                        if (!g_file_get_contents(tmp, body, NULL, NULL)) {
-                               g_warning("Error: couldn't set insert file '%s' in body\n", value);
+                               g_warning("couldn't set insert file '%s' in body", value);
                        }
                        g_free(tmp);
                        tmp = NULL;
@@ -1848,30 +1794,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, g_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);
                        }
                }
        }
@@ -1886,77 +1844,23 @@ const gchar *get_mail_base_dir(void)
        return get_home_dir();
 }
 
-#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;
 }
@@ -2079,7 +1983,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) {
@@ -2094,13 +1998,13 @@ const gchar *get_domain_name(void)
 
        return domain_name;
 #else
-       return "unknown";
+       return "localhost";
 #endif
 }
 
 off_t get_file_size(const gchar *file)
 {
-       struct stat s;
+       GStatBuf s;
 
        if (g_stat(file, &s) < 0) {
                FILE_OP_ERROR(file, "stat");
@@ -2112,7 +2016,7 @@ off_t get_file_size(const gchar *file)
 
 time_t get_file_mtime(const gchar *file)
 {
-       struct stat s;
+       GStatBuf s;
 
        if (g_stat(file, &s) < 0) {
                FILE_OP_ERROR(file, "stat");
@@ -2150,7 +2054,7 @@ off_t get_file_size_as_crlf(const gchar *file)
 
 gboolean file_exist(const gchar *file, gboolean allow_fifo)
 {
-       struct stat s;
+       GStatBuf s;
 
        if (file == NULL)
                return FALSE;
@@ -2208,7 +2112,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)
@@ -2295,7 +2199,7 @@ gint remove_all_files(const gchar *dir)
        }
 
        if ((dp = g_dir_open(".", 0, NULL)) == NULL) {
-               g_warning("failed to open directory: %s\n", dir);
+               g_warning("failed to open directory: %s", dir);
                g_free(prev_dir);
                return -1;
        }
@@ -2325,6 +2229,24 @@ 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 (is_dir_exist(filename)) {
+                       /* a numbered directory with this name exists,
+                        * remove the dot-file instead */
+                       g_free(filename);
+                       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) {
@@ -2334,7 +2256,7 @@ gint remove_numbered_files(const gchar *dir, guint first, guint last)
        }
 
        if ((dp = g_dir_open(".", 0, NULL)) == NULL) {
-               g_warning("failed to open directory: %s\n", dir);
+               g_warning("failed to open directory: %s", dir);
                g_free(prev_dir);
                return -1;
        }
@@ -2342,8 +2264,14 @@ gint remove_numbered_files(const gchar *dir, guint first, guint last)
        while ((dir_name = g_dir_read_name(dp)) != NULL) {
                file_no = to_number(dir_name);
                if (file_no > 0 && first <= file_no && file_no <= last) {
-                       if (is_dir_exist(dir_name))
+                       if (is_dir_exist(dir_name)) {
+                               gchar *dot_file = g_strdup_printf(".%s", dir_name);
+                               if (is_file_exist(dot_file) && claws_unlink(dot_file) < 0) {
+                                       FILE_OP_ERROR(dot_file, "unlink");
+                               }
+                               g_free(dot_file);
                                continue;
+                       }
                        if (claws_unlink(dir_name) < 0)
                                FILE_OP_ERROR(dir_name, "unlink");
                }
@@ -2368,6 +2296,12 @@ gint remove_numbered_files_not_in_list(const gchar *dir, GSList *numberlist)
        const gchar *dir_name;
        gchar *prev_dir;
        gint file_no;
+       GHashTable *wanted_files;
+       GSList *cur;
+       GError *error = NULL;
+
+       if (numberlist == NULL)
+           return 0;
 
        prev_dir = g_get_current_dir();
 
@@ -2377,24 +2311,41 @@ gint remove_numbered_files_not_in_list(const gchar *dir, GSList *numberlist)
                return -1;
        }
 
-       if ((dp = g_dir_open(".", 0, NULL)) == NULL) {
-               FILE_OP_ERROR(dir, "opendir");
+       if ((dp = g_dir_open(".", 0, &error)) == NULL) {
+               g_message("Couldn't open current directory: %s (%d).\n",
+                               error->message, error->code);
+               g_error_free(error);
                g_free(prev_dir);
                return -1;
        }
 
+       wanted_files = g_hash_table_new(g_direct_hash, g_direct_equal);
+       for (cur = numberlist; cur != NULL; cur = cur->next) {
+               /* numberlist->data is expected to be GINT_TO_POINTER */
+               g_hash_table_insert(wanted_files, cur->data, GINT_TO_POINTER(1));
+       }
+
        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)) {
+               if (is_dir_exist(dir_name))
+                       continue;
+               if (file_no > 0 && g_hash_table_lookup(wanted_files, GINT_TO_POINTER(file_no)) == NULL) {
                        debug_print("removing unwanted file %d from %s\n", file_no, dir);
-                       if (is_dir_exist(dir_name))
+                       if (is_dir_exist(dir_name)) {
+                               gchar *dot_file = g_strdup_printf(".%s", dir_name);
+                               if (is_file_exist(dot_file) && claws_unlink(dot_file) < 0) {
+                                       FILE_OP_ERROR(dot_file, "unlink");
+                               }
+                               g_free(dot_file);
                                continue;
+                       }
                        if (claws_unlink(dir_name) < 0)
                                FILE_OP_ERROR(dir_name, "unlink");
                }
        }
 
        g_dir_close(dp);
+       g_hash_table_destroy(wanted_files);
 
        if (g_chdir(prev_dir) < 0) {
                FILE_OP_ERROR(prev_dir, "chdir");
@@ -2414,7 +2365,7 @@ gint remove_all_numbered_files(const gchar *dir)
 
 gint remove_dir_recursive(const gchar *dir)
 {
-       struct stat s;
+       GStatBuf s;
        GDir *dp;
        const gchar *dir_name;
        gchar *prev_dir;
@@ -2422,13 +2373,13 @@ gint remove_dir_recursive(const gchar *dir)
        if (g_stat(dir, &s) < 0) {
                FILE_OP_ERROR(dir, "stat");
                if (ENOENT == errno) return 0;
-               return -1;
+               return -(errno);
        }
 
        if (!S_ISDIR(s.st_mode)) {
                if (claws_unlink(dir) < 0) {
                        FILE_OP_ERROR(dir, "unlink");
-                       return -1;
+                       return -(errno);
                }
 
                return 0;
@@ -2441,7 +2392,7 @@ gint remove_dir_recursive(const gchar *dir)
                g_free(prev_dir);
                if (g_chdir("..") < 0) {
                        FILE_OP_ERROR(dir, "chdir");
-                       return -1;
+                       return -(errno);
                }
                prev_dir = g_get_current_dir();
        }
@@ -2449,14 +2400,14 @@ gint remove_dir_recursive(const gchar *dir)
        if (g_chdir(dir) < 0) {
                FILE_OP_ERROR(dir, "chdir");
                g_free(prev_dir);
-               return -1;
+               return -(errno);
        }
 
        if ((dp = g_dir_open(".", 0, NULL)) == NULL) {
-               g_warning("failed to open directory: %s\n", dir);
+               g_warning("failed to open directory: %s", dir);
                g_chdir(prev_dir);
                g_free(prev_dir);
-               return -1;
+               return -(errno);
        }
 
        /* remove all files in the directory */
@@ -2464,9 +2415,11 @@ gint remove_dir_recursive(const gchar *dir)
                /* g_print("removing %s\n", dir_name); */
 
                if (is_dir_exist(dir_name)) {
-                       if (remove_dir_recursive(dir_name) < 0) {
-                               g_warning("can't remove directory\n");
-                               return -1;
+                       gint ret;
+
+                       if ((ret = remove_dir_recursive(dir_name)) < 0) {
+                               g_warning("can't remove directory: %s", dir_name);
+                               return ret;
                        }
                } else {
                        if (claws_unlink(dir_name) < 0)
@@ -2479,14 +2432,14 @@ gint remove_dir_recursive(const gchar *dir)
        if (g_chdir(prev_dir) < 0) {
                FILE_OP_ERROR(prev_dir, "chdir");
                g_free(prev_dir);
-               return -1;
+               return -(errno);
        }
 
        g_free(prev_dir);
 
        if (g_rmdir(dir) < 0) {
                FILE_OP_ERROR(dir, "rmdir");
-               return -1;
+               return -(errno);
        }
 
        return 0;
@@ -2532,14 +2485,14 @@ gint append_file(const gchar *src, const gchar *dest, gboolean keep_backup)
 
        if (change_file_mode_rw(dest_fp, dest) < 0) {
                FILE_OP_ERROR(dest, "chmod");
-               g_warning("can't change file mode\n");
+               g_warning("can't change file mode: %s", dest);
        }
 
        while ((n_read = fread(buf, sizeof(gchar), sizeof(buf), src_fp)) > 0) {
                if (n_read < sizeof(buf) && ferror(src_fp))
                        break;
                if (fwrite(buf, 1, n_read, dest_fp) < n_read) {
-                       g_warning("writing to %s failed.\n", dest);
+                       g_warning("writing to %s failed.", dest);
                        fclose(dest_fp);
                        fclose(src_fp);
                        claws_unlink(dest);
@@ -2600,14 +2553,14 @@ gint copy_file(const gchar *src, const gchar *dest, gboolean keep_backup)
 
        if (change_file_mode_rw(dest_fp, dest) < 0) {
                FILE_OP_ERROR(dest, "chmod");
-               g_warning("can't change file mode\n");
+               g_warning("can't change file mode: %s", dest);
        }
 
        while ((n_read = fread(buf, sizeof(gchar), sizeof(buf), src_fp)) > 0) {
                if (n_read < sizeof(buf) && ferror(src_fp))
                        break;
                if (fwrite(buf, 1, n_read, dest_fp) < n_read) {
-                       g_warning("writing to %s failed.\n", dest);
+                       g_warning("writing to %s failed.", dest);
                        fclose(dest_fp);
                        fclose(src_fp);
                        claws_unlink(dest);
@@ -2715,7 +2668,7 @@ gint copy_file_part(FILE *fp, off_t offset, size_t length, const gchar *dest)
 
        if (change_file_mode_rw(dest_fp, dest) < 0) {
                FILE_OP_ERROR(dest, "chmod");
-               g_warning("can't change file mode\n");
+               g_warning("can't change file mode: %s", dest);
        }
 
        if (copy_file_part_to_fp(fp, offset, length, dest_fp) < 0)
@@ -2727,7 +2680,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_warning("writing to %s failed.", dest);
                claws_unlink(dest);
                return -1;
        }
@@ -2795,7 +2748,7 @@ gint canonicalize_file(const gchar *src, const gchar *dest)
 
        if (change_file_mode_rw(dest_fp, dest) < 0) {
                FILE_OP_ERROR(dest, "chmod");
-               g_warning("can't change file mode\n");
+               g_warning("can't change file mode: %s", dest);
        }
 
        while (fgets(buf, sizeof(buf), src_fp) != NULL) {
@@ -2821,7 +2774,7 @@ gint canonicalize_file(const gchar *src, const gchar *dest)
                }
 
                if (r == EOF) {
-                       g_warning("writing to %s failed.\n", dest);
+                       g_warning("writing to %s failed.", dest);
                        fclose(dest_fp);
                        fclose(src_fp);
                        claws_unlink(dest);
@@ -2864,7 +2817,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_warning("can't replace file: %s", file);
                claws_unlink(tmp_file);
                g_free(tmp_file);
                return -1;
@@ -2876,7 +2829,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);
@@ -2985,7 +2938,6 @@ gint change_file_mode_rw(FILE *fp, const gchar *file)
 
 FILE *my_tmpfile(void)
 {
-#if HAVE_MKSTEMP || defined(G_OS_WIN32)
        const gchar suffix[] = ".XXXXXX";
        const gchar *tmpdir;
        guint tmplen;
@@ -3012,7 +2964,7 @@ FILE *my_tmpfile(void)
        memcpy(fname + tmplen + 1, progname, proglen);
        memcpy(fname + tmplen + 1 + proglen, suffix, sizeof(suffix));
 
-       fd = mkstemp(fname);
+       fd = g_mkstemp(fname);
        if (fd < 0)
                return tmpfile();
 
@@ -3035,23 +2987,16 @@ FILE *my_tmpfile(void)
                return fp;
        }
 
-#endif /* HAVE_MKSTEMP || G_OS_WIN32 */
-
        return tmpfile();
 }
 
 FILE *get_tmpfile_in_dir(const gchar *dir, gchar **filename)
 {
        int fd;
-#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
+       fd = g_mkstemp(*filename);
+       if (fd < 0)
+               return NULL;
        return fdopen(fd, "w+");
 }
 
@@ -3161,7 +3106,7 @@ static gchar *file_read_to_str_full(const gchar *file, gboolean recode)
 {
        FILE *fp;
        gchar *str;
-       struct stat s;
+       GStatBuf s;
 #ifndef G_OS_WIN32
        gint fd, err;
        struct timeval timeout = {1, 0};
@@ -3176,7 +3121,7 @@ static gchar *file_read_to_str_full(const gchar *file, gboolean recode)
                return NULL;
        }
        if (S_ISDIR(s.st_mode)) {
-               g_warning("%s: is a directory\n", file);
+               g_warning("%s: is a directory", file);
                return NULL;
        }
 
@@ -3203,7 +3148,7 @@ static gchar *file_read_to_str_full(const gchar *file, gboolean recode)
                if (err < 0) {
                        FILE_OP_ERROR(file, "select");
                } else {
-                       g_warning("%s: doesn't seem readable\n", file);
+                       g_warning("%s: doesn't seem readable", file);
                }
                close(fd);
                return NULL;
@@ -3293,7 +3238,7 @@ static gint execute_async(gchar *const argv[])
 
        if (g_spawn_async(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH,
                          NULL, NULL, NULL, FALSE) == FALSE) {
-               g_warning("Couldn't execute command: %s\n", argv[0]);
+               g_warning("couldn't execute command: %s", argv[0]);
                return -1;
        }
 
@@ -3309,7 +3254,7 @@ static gint execute_sync(gchar *const argv[])
 #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]);
+               g_warning("couldn't execute command: %s", argv[0]);
                return -1;
        }
 
@@ -3321,7 +3266,7 @@ static gint execute_sync(gchar *const argv[])
        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]);
+               g_warning("couldn't execute command: %s", argv[0]);
                return -1;
        }
 
@@ -3359,13 +3304,13 @@ gchar *get_command_output(const gchar *cmdline)
 
        if (g_spawn_command_line_sync(cmdline, &child_stdout, NULL, &status,
                                      NULL) == FALSE) {
-               g_warning("Couldn't execute command: %s\n", cmdline);
+               g_warning("couldn't execute command: %s", cmdline);
                return NULL;
        }
 
        return child_stdout;
 }
-#ifndef MAEMO
+
 static gint is_unchanged_uri_char(char c)
 {
        switch (c) {
@@ -3401,10 +3346,10 @@ 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;
@@ -3429,12 +3374,6 @@ gint open_uri(const gchar *uri, const gchar *cmdline)
        execute_command_line(buf, TRUE);
 #else
        ShellExecute(NULL, "open", uri, NULL, NULL, SW_SHOW);
-#endif
-#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;
 }
@@ -3483,7 +3422,7 @@ time_t remote_tzoffset_sec(const gchar *zone)
                if (c == '-')
                        remoteoffset = -remoteoffset;
        } else if (!strncmp(zone, "UT" , 2) ||
-                  !strncmp(zone, "GMT", 2)) {
+                  !strncmp(zone, "GMT", 3)) {
                remoteoffset = 0;
        } else if (strlen(zone3) == 3) {
                for (p = ustzstr; *p != '\0'; p += 3) {
@@ -3535,9 +3474,7 @@ time_t tzoffset_sec(time_t *now)
 {
        struct tm gmt, *lt;
        gint off;
-#ifndef G_OS_WIN32
        struct tm buf1, buf2;
-#endif
 #ifdef G_OS_WIN32
        if (now && *now < 0)
                return 0;
@@ -3571,9 +3508,7 @@ gchar *tzoffset(time_t *now)
        struct tm gmt, *lt;
        gint off;
        gchar sign = '+';
-#ifndef G_OS_WIN32
        struct tm buf1, buf2;
-#endif
 #ifdef G_OS_WIN32
        if (now && *now < 0)
                return 0;
@@ -3611,10 +3546,8 @@ void get_rfc822_date(gchar *buf, gint len)
        time_t t;
        gchar day[4], mon[4];
        gint dd, hh, mm, ss, yyyy;
-#ifndef G_OS_WIN32
        struct tm buf1;
        gchar buf2[BUFFSIZE];
-#endif
 
        t = time(NULL);
        lt = localtime_r(&t, &buf1);
@@ -3732,7 +3665,7 @@ int subject_get_prefix_length(const gchar *subject)
                "Vs\\:",                        /* "Vs" (Norwegian) */
                "Ad\\:",                        /* "Ad" (Norwegian) */
                "\347\255\224\345\244\215\\:",  /* "Re" (Chinese, UTF-8) */
-               "R\303\251f\\. \\:",            /* "Réf. :" (French Lotus Notes) */
+               "R\303\251f\\. \\:",            /* "R�f. :" (French Lotus Notes) */
                "Re \\:",                       /* "Re :" (French Yahoo Mail) */
                /* add more */
        };
@@ -3791,7 +3724,7 @@ int subject_get_prefix_length(const gchar *subject)
                "sv:",                  /* "Sv" (Norwegian) */
                "vs:",                  /* "Vs" (Norwegian) */
                "ad:",                  /* "Ad" (Norwegian) */
-               "R\303\251f. :",        /* "Réf. :" (French Lotus Notes) */
+               "R\303\251f. :",        /* "R�f. :" (French Lotus Notes) */
                "Re :",                 /* "Re :" (French Yahoo Mail) */
                /* add more */
        };
@@ -3843,29 +3776,23 @@ gchar *generate_msgid(gchar *buf, gint len, gchar *user_addr)
        struct tm *lt;
        time_t t;
        gchar *addr;
-#ifndef G_OS_WIN32
        struct tm buft;
-#endif
 
        t = time(NULL);
        lt = localtime_r(&t, &buft);
 
-       if (strcmp(buf, "") == 0) {
-               if (user_addr != NULL) {
-                       addr = g_strconcat(user_addr, "@", get_domain_name(), NULL);
-               }
-               else {
-                       addr = g_strconcat("@", get_domain_name(), NULL);
-               }
-       }
-       else {
-               if (user_addr != NULL) {
-                       addr = g_strconcat(user_addr, "@", buf, 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,
@@ -3882,7 +3809,7 @@ gchar *generate_msgid(gchar *buf, gint len, gchar *user_addr)
 
    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,
@@ -4023,7 +3950,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
@@ -4744,11 +4671,30 @@ void mailcap_update_default(const gchar *type, const gchar *command)
        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 = g_fopen(path, "rb");
-       FILE *outfp = g_fopen(outpath, "wb");
+       FILE *outfp = NULL;
        gchar buf[BUFFSIZE];
        gboolean err = FALSE;
 
+       if (!fp) {
+               fp = g_fopen(path, "a");
+               if (!fp) {
+                       g_warning("failed to create file %s", path);
+                       g_free(path);
+                       g_free(outpath);
+                       return;
+               }
+               fp = g_freopen(path, "rb", fp);
+               if (!fp) {
+                       g_warning("failed to reopen file %s", path);
+                       g_free(path);
+                       g_free(outpath);
+                       return;
+               }
+       }
+
+       outfp = g_fopen(outpath, "wb");
        if (!outfp) {
+               g_warning("failed to create file %s", outpath);
                g_free(path);
                g_free(outpath);
                fclose(fp);
@@ -4796,7 +4742,7 @@ gint copy_dir(const gchar *src, const gchar *dst)
        const gchar *name;
 
        if ((dir = g_dir_open(src, 0, NULL)) == NULL) {
-               g_warning("failed to open directory: %s\n", src);
+               g_warning("failed to open directory: %s", src);
                return -1;
        }
 
@@ -4820,7 +4766,7 @@ gint copy_dir(const gchar *src, const gchar *dst)
                    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;
+                       GError *error = NULL;
                        gint r = 0;
                        gchar *target = g_file_read_link(old_file, &error);
                        if (target)
@@ -4859,9 +4805,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++;
+               else if (!strncmp(buffer, "Message-ID:", strlen("Message-ID:")))
                        score++;
-               if (!strncmp(buffer, "Subject:", strlen("Subject:")))
+               else if (!strncmp(buffer, "Subject:", strlen("Subject:")))
                        score++;
                i++;
        }
@@ -4914,58 +4862,53 @@ 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;
-const gchar *time_am_pm = NULL;
-
 static gboolean time_names_init_done = FALSE;
 
 static void init_time_names(void)
 {
        int i = 0;
 
-       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");
+       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");
        
-       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_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]);
@@ -4976,21 +4919,15 @@ static void init_time_names(void)
                s_monthnames_len[i] = strlen(s_monthnames[i]);
        }
 
-       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 = 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_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");
-
-       time_am_pm = Q_("For use by strftime (default 12-hour time format)|%I:%M:%S %p");
 
        time_names_init_done = TRUE;
 }
@@ -5047,7 +4984,7 @@ size_t fast_strftime(gchar *buf, gint buflen, const gchar *format, struct tm *lt
                                strncpy2(curpos, monthnames[lt->tm_mon], buflen - total_done);
                                break;
                        case 'c':
-                               fast_strftime(subbuf, 64, def_loc_format, lt);
+                               strftime(subbuf, 64, "%c", lt);
                                len = strlen(subbuf); CHECK_SIZE();
                                strncpy2(curpos, subbuf, buflen - total_done);
                                break;
@@ -5149,7 +5086,7 @@ size_t fast_strftime(gchar *buf, gint buflen, const gchar *format, struct tm *lt
                                }
                                break;
                        case 'r':
-                               fast_strftime(subbuf, 64, time_am_pm, lt);
+                               strftime(subbuf, 64, "%r", lt);
                                len = strlen(subbuf); CHECK_SIZE();
                                strncpy2(curpos, subbuf, buflen - total_done);
                                break;
@@ -5195,12 +5132,12 @@ size_t fast_strftime(gchar *buf, gint buflen, const gchar *format, struct tm *lt
                                snprintf(curpos, buflen - total_done, "%d", lt->tm_wday);
                                break;
                        case 'x':
-                               fast_strftime(subbuf, 64, date_loc_format, lt);
+                               strftime(subbuf, 64, "%x", lt);
                                len = strlen(subbuf); CHECK_SIZE();
                                strncpy2(curpos, subbuf, buflen - total_done);
                                break;
                        case 'X':
-                               fast_strftime(subbuf, 64, time_loc_format, lt);
+                               strftime(subbuf, 64, "%X", lt);
                                len = strlen(subbuf); CHECK_SIZE();
                                strncpy2(curpos, subbuf, buflen - total_done);
                                break;
@@ -5238,8 +5175,7 @@ size_t fast_strftime(gchar *buf, gint buflen, const gchar *format, struct tm *lt
                                format++;
                                break;
                        default:
-                               if (format && *format)
-                                       g_warning("format error (%c)", *format);
+                               g_warning("format error (%c)", *format);
                                *curpos = '\0';
                                return total_done;
                        }
@@ -5250,7 +5186,7 @@ size_t fast_strftime(gchar *buf, gint buflen, const gchar *format, struct tm *lt
                        *curpos++ = *format++; 
                }
        }
-       *curpos++ = '\0';
+       *curpos = '\0';
        return total_done;
 }
 
@@ -5263,7 +5199,7 @@ gboolean prefs_common_get_use_shred(void);
 
 int claws_unlink(const gchar *filename) 
 {
-       struct stat s;
+       GStatBuf s;
        static int found_shred = -1;
        static const gchar *args[4];
 
@@ -5289,10 +5225,247 @@ int claws_unlink(const gchar *filename)
                                        debug_print("%s %s exited with status %d\n",
                                                args[0], filename, WEXITSTATUS(status));
                                        if (truncate(filename, 0) < 0)
-                                               g_warning("couln't truncate");
+                                               g_warning("couln't truncate: %s", filename);
                                }
                        }
                }
        }
        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;
+       GStatBuf 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;
+}
+
+/* Returns a decoded base64 string, guaranteed to be null-terminated. */
+guchar *g_base64_decode_zero(const gchar *text, gsize *out_len)
+{
+       gchar *tmp = g_base64_decode(text, out_len);
+       gchar *out = g_strndup(tmp, *out_len);
+
+       g_free(tmp);
+
+       if (strlen(out) != *out_len) {
+               g_warning ("strlen(out) %zd != *out_len %" G_GSIZE_FORMAT, strlen(out), *out_len);
+       }
+
+       return out;
+}
+
+#if !GLIB_CHECK_VERSION(2, 30, 0)
+/**
+ * g_utf8_substring:
+ * @str: a UTF-8 encoded string
+ * @start_pos: a character offset within @str
+ * @end_pos: another character offset within @str
+ *
+ * Copies a substring out of a UTF-8 encoded string.
+ * The substring will contain @end_pos - @start_pos
+ * characters.
+ *
+ * Returns: a newly allocated copy of the requested
+ *     substring. Free with g_free() when no longer needed.
+ *
+ * Since: GLIB 2.30
+ */
+gchar *
+g_utf8_substring (const gchar *str,
+                                 glong            start_pos,
+                                 glong            end_pos)
+{
+  gchar *start, *end, *out;
+
+  start = g_utf8_offset_to_pointer (str, start_pos);
+  end = g_utf8_offset_to_pointer (start, end_pos - start_pos);
+
+  out = g_malloc (end - start + 1);
+  memcpy (out, start, end - start);
+  out[end - start] = 0;
+
+  return out;
+}
+#endif