Rewrite unfold_line() to handle UTF8 line breaks.
[claws.git] / src / common / utils.c
index 52f6bac343111275e539d4018cf4ec514d6c607d..5e24bc649a3604032b603ce15295a23830c02662 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 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
@@ -38,6 +49,9 @@
 #include <ctype.h>
 #include <errno.h>
 #include <sys/param.h>
+#ifndef G_OS_WIN32
+#include <sys/socket.h>
+#endif
 
 #if (HAVE_WCTYPE_H && HAVE_WCHAR_H)
 #  include <wchar.h>
@@ -70,6 +84,7 @@
 #include "utils.h"
 #include "socket.h"
 #include "../codeconv.h"
+#include "tlds.h"
 
 #define BUFFSIZE       8192
 
@@ -78,165 +93,34 @@ 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)
+#if !GLIB_CHECK_VERSION(2, 26, 0)
+guchar *g_base64_decode_wa(const gchar *text, gsize *out_len)
 {
-#ifdef G_OS_WIN32
-  return w32_is_administrator ();
-#else
-  return !getuid();
-#endif  
-}
+       guchar *ret;
+       gsize input_length;
+       gint state = 0;
+       guint save = 0;
 
+       input_length = strlen(text);
 
+       ret = g_malloc0((input_length / 4) * 3 + 1);
 
-#if !GLIB_CHECK_VERSION(2, 7, 0) && !defined(G_OS_UNIX)
-gint g_chdir(const gchar *path)
-{
-#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;
-
-               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 = chdir(cp_path);
-               save_errno = errno;
-
-               g_free(cp_path);
+       *out_len = g_base64_decode_step(text, input_length, ret, &state, &save);
 
-               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
-}
-#endif /* GLIB_CHECK_VERSION && G_OS_UNIX */
-
-
-#ifdef G_OS_WIN32
-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 = 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;
-       }
-       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;
+  return !getuid();
+#endif  
 }
-#endif /* G_OS_WIN32 */
 
 GSList *slist_copy_deep(GSList *list, GCopyFunc func)
 {
@@ -922,6 +806,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, '"', '<', '>');
@@ -1111,19 +996,37 @@ void remove_space(gchar *str)
 
 void unfold_line(gchar *str)
 {
-       register gchar *p = str;
-       register gint spc;
+       register gchar *ch;
+       register gunichar c;
+       register gint len;
 
-       while (*p) {
-               if (*p == '\n' || *p == '\r') {
-                       *p++ = ' ';
-                       spc = 0;
-                       while (g_ascii_isspace(*(p + spc)))
-                               spc++;
-                       if (spc)
-                               memmove(p, p + spc, strlen(p + spc) + 1);
-               } else
-                       p++;
+       ch = str; /* iterator for source string */
+
+       while (*ch != 0) {
+               c = g_utf8_get_char_validated(ch, -1);
+
+               if (c < 0) {
+                       /* non-unicode byte, move past it */
+                       ch++;
+                       continue;
+               }
+
+               len = g_unichar_to_utf8(c, NULL);
+
+               if (!g_unichar_isdefined(c) || !g_unichar_isprint(c) ||
+                               g_unichar_isspace(c)) {
+                       /* replace anything bad or whitespacey with a single space */
+                       *ch = ' ';
+                       ch++;
+                       if (len > 1) {
+                               /* move rest of the string forwards, since we just replaced
+                                * a multi-byte sequence with one byte */
+                               memmove(ch, ch + len-1, strlen(ch + len-1) + 1);
+                       }
+               } else {
+                       /* A valid unicode character, copy it. */
+                       ch += len;
+               }
        }
 }
 
@@ -1489,7 +1392,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);
                                }
@@ -1701,7 +1604,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;
@@ -1932,7 +1835,7 @@ void set_rc_dir(const gchar *dir)
 
                if (err) {
                        g_print("Error looking for %s: %d(%s)\n",
-                               dir, -err, strerror(-err));
+                               dir, -err, g_strerror(-err));
                        exit(0);
                }
                rc_dir_alt = TRUE;
@@ -2007,7 +1910,7 @@ const gchar *get_template_dir(void)
 }
 
 #ifdef G_OS_WIN32
-const gchar *get_cert_file(void)
+const gchar *w32_get_cert_file(void)
 {
        const gchar *cert_file = NULL;
        if (!cert_file)
@@ -2057,7 +1960,7 @@ const gchar *get_plugin_dir(void)
 
 #ifdef G_OS_WIN32
 /* Return the default directory for Themes. */
-const gchar *get_themes_dir(void)
+const gchar *w32_get_themes_dir(void)
 {
        static gchar *themes_dir = NULL;
 
@@ -2095,21 +1998,28 @@ const gchar *get_domain_name(void)
 {
 #ifdef G_OS_UNIX
        static gchar *domain_name = NULL;
+       struct addrinfo hints, *res;
+       char hostname[256];
+       int s;
 
        if (!domain_name) {
-               struct hostent *hp;
-               char hostname[256];
-
                if (gethostname(hostname, sizeof(hostname)) != 0) {
                        perror("gethostname");
                        domain_name = "localhost";
                } else {
-                       hostname[sizeof(hostname) - 1] = '\0';
-                       if ((hp = my_gethostbyname(hostname)) == NULL) {
-                               perror("gethostbyname");
+                       memset(&hints, 0, sizeof(struct addrinfo));
+                       hints.ai_family = AF_UNSPEC;
+                       hints.ai_socktype = 0;
+                       hints.ai_flags = AI_CANONNAME;
+                       hints.ai_protocol = 0;
+
+                       s = getaddrinfo(hostname, NULL, &hints, &res);
+                       if (s != 0) {
+                               fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(s));
                                domain_name = g_strdup(hostname);
                        } else {
-                               domain_name = g_strdup(hp->h_name);
+                               domain_name = g_strdup(res->ai_canonname);
+                               freeaddrinfo(res);
                        }
                }
                debug_print("domain name = %s\n", domain_name);
@@ -2123,7 +2033,7 @@ const gchar *get_domain_name(void)
 
 off_t get_file_size(const gchar *file)
 {
-       struct stat s;
+       GStatBuf s;
 
        if (g_stat(file, &s) < 0) {
                FILE_OP_ERROR(file, "stat");
@@ -2135,7 +2045,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");
@@ -2173,7 +2083,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;
@@ -2306,38 +2216,23 @@ gint make_dir_hier(const gchar *dir)
 gint remove_all_files(const gchar *dir)
 {
        GDir *dp;
-       const gchar *dir_name;
-       gchar *prev_dir;
-
-       prev_dir = g_get_current_dir();
-
-       if (g_chdir(dir) < 0) {
-               FILE_OP_ERROR(dir, "chdir");
-               g_free(prev_dir);
-               return -1;
-       }
+       const gchar *file_name;
+       gchar *tmp;
 
-       if ((dp = g_dir_open(".", 0, NULL)) == NULL) {
-               g_warning("failed to open directory: %s\n", dir);
-               g_free(prev_dir);
+       if ((dp = g_dir_open(dir, 0, NULL)) == NULL) {
+               g_warning("failed to open directory: %s", dir);
                return -1;
        }
 
-       while ((dir_name = g_dir_read_name(dp)) != NULL) {
-               if (claws_unlink(dir_name) < 0)
-                       FILE_OP_ERROR(dir_name, "unlink");
+       while ((file_name = g_dir_read_name(dp)) != NULL) {
+               tmp = g_strconcat(dir, G_DIR_SEPARATOR_S, file_name, NULL);
+               if (claws_unlink(tmp) < 0)
+                       FILE_OP_ERROR(tmp, "unlink");
+               g_free(tmp);
        }
 
        g_dir_close(dp);
 
-       if (g_chdir(prev_dir) < 0) {
-               FILE_OP_ERROR(prev_dir, "chdir");
-               g_free(prev_dir);
-               return -1;
-       }
-
-       g_free(prev_dir);
-
        return 0;
 }
 
@@ -2351,6 +2246,12 @@ gint remove_numbered_files(const gchar *dir, guint first, guint last)
        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);
@@ -2369,7 +2270,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;
        }
@@ -2377,8 +2278,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");
                }
@@ -2403,7 +2310,9 @@ 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;
+       GHashTable *wanted_files;
+       GSList *cur;
+       GError *error = NULL;
 
        if (numberlist == NULL)
            return 0;
@@ -2416,32 +2325,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;
        }
 
-       file_no_tbl = g_hash_table_new(g_direct_hash, g_direct_equal);
+       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 (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);
+                       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)) {
+                               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");
                }
-       } while ((numberlist = g_slist_next(numberlist)));
+       }
 
        g_dir_close(dp);
-       g_hash_table_destroy(file_no_tbl);
+       g_hash_table_destroy(wanted_files);
 
        if (g_chdir(prev_dir) < 0) {
                FILE_OP_ERROR(prev_dir, "chdir");
@@ -2461,7 +2379,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;
@@ -2469,13 +2387,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;
@@ -2488,7 +2406,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();
        }
@@ -2496,14 +2414,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 */
@@ -2511,9 +2429,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)
@@ -2526,14 +2446,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;
@@ -2579,14 +2499,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);
@@ -2647,14 +2567,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);
@@ -2762,7 +2682,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)
@@ -2774,7 +2694,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;
        }
@@ -2842,7 +2762,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) {
@@ -2868,7 +2788,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);
@@ -2911,7 +2831,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;
@@ -3032,7 +2952,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;
@@ -3059,7 +2978,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();
 
@@ -3082,23 +3001,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+");
 }
 
@@ -3208,7 +3120,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};
@@ -3223,7 +3135,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;
        }
 
@@ -3250,7 +3162,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;
@@ -3340,7 +3252,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;
        }
 
@@ -3356,7 +3268,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;
        }
 
@@ -3368,7 +3280,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;
        }
 
@@ -3406,7 +3318,7 @@ 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;
        }
 
@@ -3524,7 +3436,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) {
@@ -3721,19 +3633,15 @@ void subject_table_remove(GHashTable *subject_table, gchar * subject)
        g_hash_table_remove(subject_table, subject);
 }
 
-#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
 }
 
 /*!
@@ -3749,7 +3657,6 @@ void utils_free_regex(void)
  */
 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:" */
@@ -3810,44 +3717,8 @@ 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;
@@ -4336,35 +4207,6 @@ gchar *make_uri_string(const gchar *bp, const gchar *ep)
 
 static GHashTable *create_domain_tab(void)
 {
-       static const gchar *toplvl_domains [] = {
-           "museum", "aero",
-           "arpa", "coop", "info", "name", "biz", "com", "edu", "gov",
-           "int", "mil", "net", "org", "ac", "ad", "ae", "af", "ag",
-           "ai", "al", "am", "an", "ao", "aq", "ar", "as", "at", "au",
-           "aw", "az", "ba", "bb", "bd", "be", "bf", "bg", "bh", "bi",
-           "bj", "bm", "bn", "bo", "br", "bs", "bt", "bv", "bw", "by",
-           "bz", "ca", "cc", "cd", "cf", "cg", "ch", "ci", "ck", "cl",
-           "cm", "cn", "co", "cr", "cu", "cv", "cx", "cy", "cz", "de",
-           "dj", "dk", "dm", "do", "dz", "ec", "ee", "eg", "eh", "er",
-           "es", "et", "eu", "fi", "fj", "fk", "fm", "fo", "fr", "ga", "gd",
-           "ge", "gf", "gg", "gh", "gi", "gl", "gm", "gn", "gp", "gq",
-           "gr", "gs", "gt", "gu", "gw", "gy", "hk", "hm", "hn", "hr",
-           "ht", "hu", "id", "ie", "il", "im", "in", "io", "iq", "ir",
-           "is", "it", "je", "jm", "jo", "jp", "ke", "kg", "kh", "ki",
-           "km", "kn", "kp", "kr", "kw", "ky", "kz", "la", "lb", "lc",
-           "li", "lk", "lr", "ls", "lt", "lu", "lv", "ly", "ma", "mc",
-           "md", "mg", "mh", "mk", "ml", "mm", "mn", "mo", "mp", "mq",
-           "mr", "ms", "mt", "mu", "mv", "mw", "mx", "my", "mz", "na",
-           "nc", "ne", "nf", "ng", "ni", "nl", "no", "np", "nr", "nu",
-           "nz", "om", "pa", "pe", "pf", "pg", "ph", "pk", "pl", "pm",
-           "pn", "pr", "ps", "pt", "pw", "py", "qa", "re", "ro", "ru",
-           "rw", "sa", "sb", "sc", "sd", "se", "sg", "sh", "si", "sj",
-           "sk", "sl", "sm", "sn", "so", "sr", "st", "sv", "sy", "sz",
-           "tc", "td", "tf", "tg", "th", "tj", "tk", "tm", "tn", "to",
-           "tp", "tr", "tt", "tv", "tw", "tz", "ua", "ug", "uk", "um",
-           "us", "uy", "uz", "va", "vc", "ve", "vg", "vi", "vn", "vu",
-           "wf", "ws", "ye", "yt", "yu", "za", "zm", "zw"
-       };
        gint n;
        GHashTable *htab = g_hash_table_new(g_stricase_hash, g_stricase_equal);
 
@@ -4634,10 +4476,21 @@ gchar *make_email_string(const gchar *bp, const gchar *ep)
         * uri type later on in the button_pressed signal handler */
        gchar *tmp;
        gchar *result;
+       gchar *colon, *at;
 
        tmp = g_strndup(bp, ep - bp);
-       result = g_strconcat("mailto:", tmp, NULL);
-       g_free(tmp);
+
+       /* If there is a colon in the username part of the address,
+        * we're dealing with an URI for some other protocol - do
+        * not prefix with mailto: in such case. */
+       colon = strchr(tmp, ':');
+       at = strchr(tmp, '@');
+       if (colon != NULL && at != NULL && colon < at) {
+               result = tmp;
+       } else {
+               result = g_strconcat("mailto:", tmp, NULL);
+               g_free(tmp);
+       }
 
        return result;
 }
@@ -4724,22 +4577,6 @@ static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type,
                        result = g_strdup(trimmed);
                        g_strfreev(parts);
                        fclose(fp);
-                       /* if there are no single quotes around %s, add them.
-                        * '.*%s.*' is ok, as in display 'png:%s'
-                        */
-                       if (strstr(result, "%s") 
-                       && !(strstr(result, "'") < strstr(result,"%s") &&
-                            strstr(strstr(result,"%s"), "'"))) {
-                               gchar *start = g_strdup(result);
-                               gchar *end = g_strdup(strstr(result, "%s")+2);
-                               gchar *tmp;
-                               *strstr(start, "%s") = '\0';
-                               tmp = g_strconcat(start,"'%s'",end, NULL);
-                               g_free(start);
-                               g_free(end);
-                               g_free(result);
-                               result = tmp;
-                       }
                        if (needsterminal) {
                                gchar *tmp = g_strdup_printf("xterm -e %s", result);
                                g_free(result);
@@ -4773,11 +4610,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);
@@ -4825,7 +4681,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;
        }
 
@@ -4849,7 +4705,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)
@@ -4945,11 +4801,6 @@ 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)
@@ -5016,12 +4867,6 @@ static void init_time_names(void)
        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 = 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 = C_("For use by strftime (default 12-hour time format)", "%I:%M:%S %p");
 
        time_names_init_done = TRUE;
 }
@@ -5078,7 +4923,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;
@@ -5180,7 +5025,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;
@@ -5193,7 +5038,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, 64, "%ld", mktime(lt));
+                               snprintf(subbuf, 64, "%lld", (long long)mktime(lt));
                                len = strlen(subbuf); CHECK_SIZE();
                                strncpy2(curpos, subbuf, buflen - total_done);
                                break;
@@ -5226,12 +5071,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;
@@ -5269,8 +5114,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;
                        }
@@ -5294,7 +5138,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];
 
@@ -5320,7 +5164,7 @@ 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);
                                }
                        }
                }
@@ -5385,7 +5229,7 @@ static GSList *cm_split_path(const gchar *filename, int depth)
 {
        gchar **path_parts;
        GSList *canonical_parts = NULL;
-       struct stat st;
+       GStatBuf st;
        int i;
        gboolean follow_symlinks = TRUE;
 
@@ -5516,44 +5360,51 @@ int cm_canonicalize_filename(const gchar *filename, gchar **canonical_name) {
        return 0;
 }
 
-#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
-gboolean auto_configure_service(const gchar *service, const gchar *domain, gchar **srvhost, guint16 *srvport)
+/* Returns a decoded base64 string, guaranteed to be null-terminated. */
+guchar *g_base64_decode_zero(const gchar *text, gsize *out_len)
 {
-       GResolver *resolver;
-       GList *answers, *cur;
-       GError *error = NULL;
-       gboolean result = FALSE;
+       gchar *tmp = g_base64_decode(text, out_len);
+       gchar *out = g_strndup(tmp, *out_len);
 
-       cm_return_val_if_fail(service != NULL, FALSE);
-       cm_return_val_if_fail(domain != NULL, FALSE);
+       g_free(tmp);
 
-       resolver = g_resolver_get_default();
-       if (resolver == NULL)
-               return FALSE;
-       
-       answers = g_resolver_lookup_service(resolver, service, "tcp", domain, NULL, &error);
-
-       *srvhost = NULL;
-       *srvport = 0;
-
-       if (answers) {
-               for (cur = g_srv_target_list_sort(answers); cur; cur = cur->next) {
-                       GSrvTarget *target = (GSrvTarget *)cur->data;
-                       const gchar *hostname = g_srv_target_get_hostname(target);
-                       guint16 port = g_srv_target_get_port(target);
-                       if (hostname && strcmp(hostname,"") && port > 0) {
-                               result = TRUE;
-                               *srvhost = g_strdup(hostname);
-                               *srvport = port;
-                               break;
-                       }
-               }
-               g_resolver_free_targets(answers);
-       } else if (error) {
-               g_error_free(error);
+       if (strlen(out) != *out_len) {
+               g_warning ("strlen(out) %zd != *out_len %" G_GSIZE_FORMAT, strlen(out), *out_len);
        }
 
-       g_object_unref(resolver);
-       return result;
+       return out;
 }
-#endif
\ No newline at end of file
+
+#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