2006-03-23 [paul] 2.0.0cvs164
[claws.git] / src / common / utils.c
index 51a2b499df752ec407c5ce2da74cb62d4061b39e..fdc1a0db6bf5335a0693c5aa112aec4e8547fea7 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Sylpheed-Claws 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
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
 #include "defs.h"
 
 #include <glib.h>
+#ifdef ENABLE_NLS
+#include <glib/gi18n.h>
+#else
+#define _(a) (a)
+#define N_(a) (a)
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <unistd.h>
 #include <stdarg.h>
 #include <sys/types.h>
-#include <sys/wait.h>
+#if HAVE_SYS_WAIT_H
+#  include <sys/wait.h>
+#endif
 #include <dirent.h>
 #include <time.h>
+#include <regex.h>
+
+#ifdef G_OS_UNIX
+#include <sys/utsname.h>
+#endif
+
+#ifdef G_OS_WIN32
+#  include <direct.h>
+#  include <io.h>
+#  include <fcntl.h>
+#endif
 
-#include "intl.h"
 #include "utils.h"
 #include "socket.h"
+#include "../codeconv.h"
 
 #define BUFFSIZE       8192
 
 static gboolean debug_mode = FALSE;
+#ifdef G_OS_WIN32
+static GSList *tempfiles=NULL;
+#endif
+
+
+#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);
+
+               errno = save_errno;
+               return retval;
+       }
+#else
+       return chdir(path);
+#endif
+}
+
+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;
+               }
 
-static void hash_free_strings_func(gpointer key, gpointer value, gpointer data);
+               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
+}
+#endif /* GLIB_CHECK_VERSION && G_OS_UNIX */
+
+
+#ifdef G_OS_WIN32
+gint mkstemp_name(const gchar *template, gchar **name_used)
+{
+       static gulong count=0; /* W32-_mktemp only supports up to 27
+                                  tempfiles... */
+       int tmpfd;
+
+       *name_used = g_strdup_printf("%s.%ld",_mktemp(template),count++);
+       tmpfd = open (*name_used, (O_CREAT | O_RDWR | O_BINARY),
+                                    (S_IRUSR | S_IWUSR));
+
+       tempfiles=g_slist_append(tempfiles, g_strdup(*name_used));
+       if (tmpfd<0) {
+               perror(g_strdup_printf("cant create %s",*name_used));
+               return -1;
+       }
+       else
+               return tmpfd;
+}
+#endif /* G_OS_WIN32 */
+
+#ifdef G_OS_WIN32
+gint mkstemp(const gchar *template)
+{
+       gchar *dummyname;
+       gint res = mkstemp_name(template, &dummyname);
+       g_free(dummyname);
+       return res;
+}
+#endif /* G_OS_WIN32 */
 
 void list_free_strings(GList *list)
 {
@@ -76,7 +221,7 @@ GSList *slist_concat_unique (GSList *first, GSList *second)
        if (first == NULL) {
                if (second == NULL)
                        return NULL;
-               else 
+               else
                        return second;
        } else if (second == NULL)
                return first;
@@ -87,7 +232,7 @@ GSList *slist_concat_unique (GSList *first, GSList *second)
        }
        return ret;
 }
+
 static void hash_free_strings_func(gpointer key, gpointer value, gpointer data)
 {
        g_free(key);
@@ -109,6 +254,25 @@ void hash_free_value_mem(GHashTable *table)
        g_hash_table_foreach(table, hash_free_value_mem_func, NULL);
 }
 
+gint str_case_equal(gconstpointer v, gconstpointer v2)
+{
+       return g_ascii_strcasecmp((const gchar *)v, (const gchar *)v2) == 0;
+}
+
+guint str_case_hash(gconstpointer key)
+{
+       const gchar *p = key;
+       guint h = *p;
+
+       if (h) {
+               h = g_ascii_tolower(h);
+               for (p += 1; *p != '\0'; p++)
+                       h = (h << 5) - h + g_ascii_tolower(*p);
+       }
+
+       return h;
+}
+
 void ptr_array_free_strings(GPtrArray *array)
 {
        gint i;
@@ -122,6 +286,26 @@ 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;
+}
+
+gboolean str_find_equal(const gchar *haystack, const gchar *needle)
+{
+       return strcmp(haystack, needle) == 0;
+}
+
+gboolean str_case_find_equal(const gchar *haystack, const gchar *needle)
+{
+       return g_ascii_strcasecmp(haystack, needle) == 0;
+}
+
 gint to_number(const gchar *nstr)
 {
        register const gchar *p;
@@ -129,7 +313,7 @@ gint to_number(const gchar *nstr)
        if (*nstr == '\0') return -1;
 
        for (p = nstr; *p != '\0'; p++)
-               if (!isdigit(*p)) return -1;
+               if (!g_ascii_isdigit(*p)) return -1;
 
        return atoi(nstr);
 }
@@ -186,17 +370,35 @@ gchar *strstr2(const gchar *s1, const gchar *s2)
 gint path_cmp(const gchar *s1, const gchar *s2)
 {
        gint len1, len2;
+        int rc;
+#ifdef G_OS_WIN32
+        gchar *s1buf, *s2buf;
+#endif
 
        if (s1 == NULL || s2 == NULL) return -1;
        if (*s1 == '\0' || *s2 == '\0') return -1;
 
+#ifdef G_OS_WIN32
+        s1buf = g_strdup (s1);
+        s2buf = g_strdup (s2);
+        subst_char (s1buf, '/', G_DIR_SEPARATOR);
+        subst_char (s2buf, '/', G_DIR_SEPARATOR);
+        s1 = s1buf;
+        s2 = s2buf;
+#endif /* !G_OS_WIN32 */
+
        len1 = strlen(s1);
        len2 = strlen(s2);
 
        if (s1[len1 - 1] == G_DIR_SEPARATOR) len1--;
        if (s2[len2 - 1] == G_DIR_SEPARATOR) len2--;
 
-       return strncmp(s1, s2, MAX(len1, len2));
+       rc = strncmp(s1, s2, MAX(len1, len2));
+#ifdef G_OS_WIN32
+        g_free (s1buf);
+        g_free (s2buf);
+#endif /* !G_OS_WIN32 */
+        return rc;
 }
 
 /* remove trailing return code */
@@ -244,6 +446,36 @@ gchar *strcrchomp(gchar *str)
        return str;
 }
 
+void file_strip_crs(const gchar *file)
+{
+       FILE *fp = NULL, *outfp = NULL;
+       gchar buf[4096];
+       gchar *out = get_tmp_file();
+       if (file == NULL)
+               goto freeout;
+
+       fp = fopen(file, "rb");
+       if (!fp)
+               goto freeout;
+
+       outfp = fopen(out, "wb");
+       if (!outfp) {
+               fclose(fp);
+               goto freeout;
+       }
+
+       while (fgets(buf, sizeof (buf), fp) != NULL) {
+               strcrchomp(buf);
+               fputs(buf, outfp);
+       }
+
+       fclose(fp);
+       fclose(outfp);
+       rename_force(out, file);
+freeout:
+       g_free(out);
+}
+
 /* Similar to `strstr' but this function ignores the case of both strings.  */
 gchar *strcasestr(const gchar *haystack, const gchar *needle)
 {
@@ -256,7 +488,7 @@ gchar *strcasestr(const gchar *haystack, const gchar *needle)
                return NULL;
 
        while (haystack_len >= needle_len) {
-               if (!strncasecmp(haystack, needle, needle_len))
+               if (!g_ascii_strncasecmp(haystack, needle, needle_len))
                        return (gchar *)haystack;
                else {
                        haystack++;
@@ -267,36 +499,53 @@ gchar *strcasestr(const gchar *haystack, const gchar *needle)
        return NULL;
 }
 
+gpointer my_memmem(gconstpointer haystack, size_t haystacklen,
+                  gconstpointer needle, size_t needlelen)
+{
+       const gchar *haystack_ = (const gchar *)haystack;
+       const gchar *needle_ = (const gchar *)needle;
+       const gchar *haystack_cur = (const gchar *)haystack;
+
+       if (needlelen == 1)
+               return memchr(haystack_, *needle_, haystacklen);
+
+       while ((haystack_cur = memchr(haystack_cur, *needle_, haystacklen))
+              != NULL) {
+               if (haystacklen - (haystack_cur - haystack_) < needlelen)
+                       break;
+               if (memcmp(haystack_cur + 1, needle_ + 1, needlelen - 1) == 0)
+                       return (gpointer)haystack_cur;
+               else
+                       haystack_cur++;
+       }
+
+       return NULL;
+}
+
 /* Copy no more than N characters of SRC to DEST, with NULL terminating.  */
 gchar *strncpy2(gchar *dest, const gchar *src, size_t n)
 {
-       register gchar c;
-       gchar *s = dest;
+       register const gchar *s = src;
+       register gchar *d = dest;
 
-       do {
-               if (--n == 0) {
-                       *dest = '\0';
-                       return s;
-               }
-               c = *src++;
-               *dest++ = c;
-       } while (c != '\0');
+       while (--n && *s)
+               *d++ = *s++;
+       *d = '\0';
 
-       /* don't do zero fill */
-       return s;
+       return dest;
 }
 
 #if !HAVE_ISWALNUM
 int iswalnum(wint_t wc)
 {
-       return isalnum((int)wc);
+       return g_ascii_isalnum((int)wc);
 }
 #endif
 
 #if !HAVE_ISWSPACE
 int iswspace(wint_t wc)
 {
-       return isspace((int)wc);
+       return g_ascii_isspace((int)wc);
 }
 #endif
 
@@ -469,16 +718,38 @@ wchar_t *wcscasestr(const wchar_t *haystack, const wchar_t *needle)
        return NULL;
 }
 
+gint get_mbs_len(const gchar *s)
+{
+       const gchar *p = s;
+       gint mb_len;
+       gint len = 0;
+
+       if (!p)
+               return -1;
+
+       while (*p != '\0') {
+               mb_len = g_utf8_skip[*(guchar *)p];
+               if (mb_len == 0)
+                       break;
+               else
+                       len++;
+
+               p += mb_len;
+       }
+
+       return len;
+}
+
 /* Examine if next block is non-ASCII string */
-gboolean is_next_nonascii(const guchar *s)
+gboolean is_next_nonascii(const gchar *s)
 {
-       const guchar *p;
+       const gchar *p;
 
        /* skip head space */
-       for (p = s; *p != '\0' && isspace(*p); p++)
+       for (p = s; *p != '\0' && g_ascii_isspace(*p); p++)
                ;
-       for (; *p != '\0' && !isspace(*p); p++) {
-               if (*p > 127 || *p < 32)
+       for (; *p != '\0' && !g_ascii_isspace(*p); p++) {
+               if (*(guchar *)p > 127 || *(guchar *)p < 32)
                        return TRUE;
        }
 
@@ -489,7 +760,7 @@ gint get_next_word_len(const gchar *s)
 {
        gint len = 0;
 
-       for (; *s != '\0' && !isspace(*s); s++, len++)
+       for (; *s != '\0' && !g_ascii_isspace(*s); s++, len++)
                ;
 
        return len;
@@ -526,7 +797,7 @@ gint subject_compare_for_sort(const gchar *s1, const gchar *s2)
        trim_subject_for_sort(str1);
        trim_subject_for_sort(str2);
 
-       return strcasecmp(str1, str2);
+       return g_utf8_collate(str1, str2);
 }
 
 void trim_subject_for_compare(gchar *str)
@@ -537,11 +808,9 @@ void trim_subject_for_compare(gchar *str)
        eliminate_parenthesis(str, '(', ')');
        g_strstrip(str);
 
-       while (!strncasecmp(str, "Re:", 3)) {
-               srcp = str + 3;
-               while (isspace(*srcp)) srcp++;
+       srcp = str + subject_get_prefix_length(str);
+       if (srcp != str)
                memmove(str, srcp, strlen(srcp) + 1);
-       }
 }
 
 void trim_subject_for_sort(gchar *str)
@@ -550,47 +819,45 @@ void trim_subject_for_sort(gchar *str)
 
        g_strstrip(str);
 
-       while (!strncasecmp(str, "Re:", 3)) {
-               srcp = str + 3;
-               while (isspace(*srcp)) srcp++;
+       srcp = str + subject_get_prefix_length(str);
+       if (srcp != str)
                memmove(str, srcp, strlen(srcp) + 1);
-       }
 }
 
 void trim_subject(gchar *str)
 {
-       register gchar *srcp, *destp;
+       register gchar *srcp;
        gchar op, cl;
        gint in_brace;
 
-       destp = str;
-       while (!strncasecmp(destp, "Re:", 3)) {
-               destp += 3;
-               while (isspace(*destp)) destp++;
-       }
+       g_strstrip(str);
 
-       if (*destp == '[') {
+       srcp = str + subject_get_prefix_length(str);
+
+       if (*srcp == '[') {
                op = '[';
                cl = ']';
-       } else if (*destp == '(') {
+       } else if (*srcp == '(') {
                op = '(';
                cl = ')';
        } else
-               return;
+               op = 0;
 
-       srcp = destp + 1;
-       in_brace = 1;
-       while (*srcp) {
-               if (*srcp == op)
-                       in_brace++;
-               else if (*srcp == cl)
-                       in_brace--;
-               srcp++;
-               if (in_brace == 0)
-                       break;
+       if (op) {
+               ++srcp;
+               in_brace = 1;
+               while (*srcp) {
+                       if (*srcp == op)
+                               in_brace++;
+                       else if (*srcp == cl)
+                               in_brace--;
+                       srcp++;
+                       if (in_brace == 0)
+                               break;
+               }
        }
-       while (isspace(*srcp)) srcp++;
-       memmove(destp, srcp, strlen(srcp) + 1);
+       while (g_ascii_isspace(*srcp)) srcp++;
+       memmove(str, srcp, strlen(srcp) + 1);
 }
 
 void eliminate_parenthesis(gchar *str, gchar op, gchar cl)
@@ -612,7 +879,7 @@ void eliminate_parenthesis(gchar *str, gchar op, gchar cl)
                        if (in_brace == 0)
                                break;
                }
-               while (isspace(*srcp)) srcp++;
+               while (g_ascii_isspace(*srcp)) srcp++;
                memmove(destp, srcp, strlen(srcp) + 1);
        }
 }
@@ -644,35 +911,6 @@ void extract_parenthesis(gchar *str, gchar op, gchar cl)
        *destp = '\0';
 }
 
-void extract_one_parenthesis_with_skip_quote(gchar *str, gchar quote_chr,
-                                            gchar op, gchar cl)
-{
-       register gchar *srcp, *destp;
-       gint in_brace;
-       gboolean in_quote = FALSE;
-
-       srcp = destp = str;
-
-       if ((srcp = strchr_with_skip_quote(destp, quote_chr, op))) {
-               memmove(destp, srcp + 1, strlen(srcp));
-               in_brace = 1;
-               while(*destp) {
-                       if (*destp == op && !in_quote)
-                               in_brace++;
-                       else if (*destp == cl && !in_quote)
-                               in_brace--;
-                       else if (*destp == quote_chr)
-                               in_quote ^= TRUE;
-
-                       if (in_brace == 0)
-                               break;
-
-                       destp++;
-               }
-       }
-       *destp = '\0';
-}
-
 void extract_parenthesis_with_skip_quote(gchar *str, gchar quote_chr,
                                         gchar op, gchar cl)
 {
@@ -713,7 +951,7 @@ void eliminate_quote(gchar *str, gchar quote_chr)
        while ((destp = strchr(destp, quote_chr))) {
                if ((srcp = strchr(destp + 1, quote_chr))) {
                        srcp++;
-                       while (isspace(*srcp)) srcp++;
+                       while (g_ascii_isspace(*srcp)) srcp++;
                        memmove(destp, srcp, strlen(srcp) + 1);
                } else {
                        *destp = '\0';
@@ -752,7 +990,7 @@ void eliminate_address_comment(gchar *str)
                        if (*srcp == '@') {
                                destp = srcp + 1;
                        } else {
-                               while (isspace(*srcp)) srcp++;
+                               while (g_ascii_isspace(*srcp)) srcp++;
                                memmove(destp, srcp, strlen(srcp) + 1);
                        }
                } else {
@@ -775,7 +1013,7 @@ void eliminate_address_comment(gchar *str)
                        if (in_brace == 0)
                                break;
                }
-               while (isspace(*srcp)) srcp++;
+               while (g_ascii_isspace(*srcp)) srcp++;
                memmove(destp, srcp, strlen(srcp) + 1);
        }
 }
@@ -820,6 +1058,13 @@ void extract_address(gchar *str)
        g_strstrip(str);
 }
 
+void extract_list_id_str(gchar *str)
+{
+       if (strchr_with_skip_quote(str, '"', '<'))
+               extract_parenthesis_with_skip_quote(str, '"', '<', '>');
+       g_strstrip(str);
+}
+
 static GSList *address_list_append_real(GSList *addr_list, const gchar *str, gboolean removecomments)
 {
        gchar *work;
@@ -866,7 +1111,7 @@ GSList *address_list_append_with_comments(GSList *addr_list, const gchar *str)
        return address_list_append_real(addr_list, str, FALSE);
 }
 
-GSList *references_list_append(GSList *msgid_list, const gchar *str)
+GSList *references_list_prepend(GSList *msgid_list, const gchar *str)
 {
        const gchar *strp;
 
@@ -886,7 +1131,7 @@ GSList *references_list_append(GSList *msgid_list, const gchar *str)
                msgid = g_strndup(start + 1, end - start - 1);
                g_strstrip(msgid);
                if (*msgid)
-                       msgid_list = g_slist_append(msgid_list, msgid);
+                       msgid_list = g_slist_prepend(msgid_list, msgid);
                else
                        g_free(msgid);
 
@@ -896,6 +1141,17 @@ GSList *references_list_append(GSList *msgid_list, const gchar *str)
        return msgid_list;
 }
 
+GSList *references_list_append(GSList *msgid_list, const gchar *str)
+{
+       GSList *list;
+
+       list = references_list_prepend(NULL, str);
+       list = g_slist_reverse(list);
+       msgid_list = g_slist_concat(msgid_list, list);
+
+       return msgid_list;
+}
+
 GSList *newsgroup_list_append(GSList *group_list, const gchar *str)
 {
        gchar *work;
@@ -943,7 +1199,7 @@ GList *add_history(GList *list, const gchar *str)
                last = g_list_last(list);
                if (last) {
                        g_free(last->data);
-                       g_list_remove(list, last->data);
+                       list = g_list_remove(list, last->data);
                }
        }
 
@@ -971,7 +1227,7 @@ void remove_space(gchar *str)
 
        while (*p) {
                spc = 0;
-               while (isspace(*(p + spc)))
+               while (g_ascii_isspace(*(p + spc)))
                        spc++;
                if (spc)
                        memmove(p, p + spc, strlen(p + spc) + 1);
@@ -989,7 +1245,7 @@ void unfold_line(gchar *str)
                if (*p == '\n' || *p == '\r') {
                        *p++ = ' ';
                        spc = 0;
-                       while (isspace(*(p + spc)))
+                       while (g_ascii_isspace(*(p + spc)))
                                spc++;
                        if (spc)
                                memmove(p, p + spc, strlen(p + spc) + 1);
@@ -1022,7 +1278,21 @@ void subst_chars(gchar *str, gchar *orig, gchar subst)
 
 void subst_for_filename(gchar *str)
 {
-       subst_chars(str, " \t\r\n\"/\\", '_');
+       if (!str)
+               return;
+#ifdef G_OS_WIN32
+       subst_chars(str, "\t\r\n\\/*:", '_');
+#else
+       subst_chars(str, "\t\r\n\\/*", '_');
+#endif
+}
+
+void subst_for_shellsafe_filename(gchar *str)
+{
+       if (!str)
+               return;
+       subst_for_filename(str);
+       subst_chars(str, " \"'|&;()<>'!{}[]",'_');
 }
 
 gboolean is_header_line(const gchar *str)
@@ -1038,14 +1308,16 @@ gboolean is_header_line(const gchar *str)
        return FALSE;
 }
 
-gboolean is_ascii_str(const guchar *str)
+gboolean is_ascii_str(const gchar *str)
 {
-       while (*str != '\0') {
-               if (*str != '\t' && *str != ' ' &&
-                   *str != '\r' && *str != '\n' &&
-                   (*str < 32 || *str >= 127))
+       const guchar *p = (const guchar *)str;
+
+       while (*p != '\0') {
+               if (*p != '\t' && *p != ' ' &&
+                   *p != '\r' && *p != '\n' &&
+                   (*p < 32 || *p >= 127))
                        return FALSE;
-               str++;
+               p++;
        }
 
        return TRUE;
@@ -1069,7 +1341,7 @@ gint get_quote_level(const gchar *str, const gchar *quote_chars)
 
        while (p <= last_pos) {
                while (p < last_pos) {
-                       if (isspace(*p))
+                       if (g_ascii_isspace(*p))
                                p++;
                        else
                                break;
@@ -1077,11 +1349,11 @@ gint get_quote_level(const gchar *str, const gchar *quote_chars)
 
                if (strchr(quote_chars, *p))
                        quote_level++;
-               else if (*p != '-' && !isspace(*p) && p <= last_pos) {
+               else if (*p != '-' && !g_ascii_isspace(*p) && p <= last_pos) {
                        /* any characters are allowed except '-' and space */
-                       while (*p != '-' 
-                              && !strchr(quote_chars, *p) 
-                              && !isspace(*p) 
+                       while (*p != '-'
+                              && !strchr(quote_chars, *p)
+                              && !g_ascii_isspace(*p)
                               && p < last_pos)
                                p++;
                        if (strchr(quote_chars, *p))
@@ -1096,7 +1368,33 @@ gint get_quote_level(const gchar *str, const gchar *quote_chars)
        return quote_level;
 }
 
-const gchar * line_has_quote_char(const gchar * str, const gchar *quote_chars) 
+gint check_line_length(const gchar *str, gint max_chars, gint *line)
+{
+       const gchar *p = str, *q;
+       gint cur_line = 0, len;
+
+       while ((q = strchr(p, '\n')) != NULL) {
+               len = q - p + 1;
+               if (len > max_chars) {
+                       if (line)
+                               *line = cur_line;
+                       return -1;
+               }
+               p = q + 1;
+               ++cur_line;
+       }
+
+       len = strlen(p);
+       if (len > max_chars) {
+               if (line)
+                       *line = cur_line;
+               return -1;
+       }
+
+       return 0;
+}
+
+const gchar * line_has_quote_char(const gchar * str, const gchar *quote_chars)
 {
        gchar * position = NULL;
        gchar * tmp_pos = NULL;
@@ -1104,17 +1402,17 @@ const gchar * line_has_quote_char(const gchar * str, const gchar *quote_chars)
 
        if (quote_chars == NULL)
                return FALSE;
-       
+
        for (i = 0; i < strlen(quote_chars); i++) {
                tmp_pos = strchr (str,  quote_chars[i]);
-               if(position == NULL 
+               if(position == NULL
                   || (tmp_pos != NULL && position >= tmp_pos) )
                        position = tmp_pos;
        }
-       return position; 
+       return position;
 }
 
-const gchar * line_has_quote_char_last(const gchar * str, const gchar *quote_chars) 
+const gchar * line_has_quote_char_last(const gchar * str, const gchar *quote_chars)
 {
        gchar * position = NULL;
        gchar * tmp_pos = NULL;
@@ -1122,14 +1420,14 @@ const gchar * line_has_quote_char_last(const gchar * str, const gchar *quote_cha
 
        if (quote_chars == NULL)
                return FALSE;
-       
+
        for (i = 0; i < strlen(quote_chars); i++) {
                tmp_pos = strrchr (str, quote_chars[i]);
-               if(position == NULL 
+               if(position == NULL
                   || (tmp_pos != NULL && position <= tmp_pos) )
                        position = tmp_pos;
        }
-       return position; 
+       return position;
 }
 
 gchar *strstr_with_skip_quote(const gchar *haystack, const gchar *needle)
@@ -1230,7 +1528,7 @@ gchar **strsplit_parenthesis(const gchar *str, gchar op, gchar cl,
                        n++;
                        str = s_cl + 1;
 
-                       while (*str && isspace(*str)) str++;
+                       while (*str && g_ascii_isspace(*str)) str++;
                        if (*str != op) {
                                string_list = g_slist_prepend(string_list,
                                                              g_strdup(""));
@@ -1355,17 +1653,17 @@ gchar *trim_string(const gchar *str, gint len)
        if (!str) return NULL;
        if (strlen(str) <= len)
                return g_strdup(str);
+       if (g_utf8_validate(str, -1, NULL) == FALSE)
+               return g_strdup(str);
 
        while (*p != '\0') {
-               mb_len = mblen(p, MB_LEN_MAX);
+               mb_len = g_utf8_skip[*(guchar *)p];
                if (mb_len == 0)
                        break;
-               else if (mb_len < 0)
-                       return g_strdup(str);
                else if (new_len + mb_len > len)
                        break;
-               else
-                       new_len += mb_len;
+
+               new_len += mb_len;
                p += mb_len;
        }
 
@@ -1377,25 +1675,44 @@ GList *uri_list_extract_filenames(const gchar *uri_list)
 {
        GList *result = NULL;
        const gchar *p, *q;
-       gchar *file;
+       gchar *escaped_utf8uri;
 
        p = uri_list;
 
        while (p) {
                if (*p != '#') {
-                       while (isspace(*p)) p++;
+                       while (g_ascii_isspace(*p)) p++;
                        if (!strncmp(p, "file:", 5)) {
-                               p += 5;
                                q = p;
+                               q += 5;
                                while (*q && *q != '\n' && *q != '\r') q++;
 
                                if (q > p) {
+                                       gchar *file, *locale_file = NULL;
                                        q--;
-                                       while (q > p && isspace(*q)) q--;
-                                       file = g_malloc(q - p + 2);
-                                       strncpy(file, p, q - p + 1);
-                                       file[q - p + 1] = '\0';
-                                       result = g_list_append(result,file);
+                                       while (q > p && g_ascii_isspace(*q))
+                                               q--;
+                                       Xalloca(escaped_utf8uri, q - p + 2,
+                                               return result);
+                                       Xalloca(file, q - p + 2,
+                                               return result);
+                                       *file = '\0';
+                                       strncpy(escaped_utf8uri, p, q - p + 1);
+                                       escaped_utf8uri[q - p + 1] = '\0';
+                                       decode_uri(file, escaped_utf8uri);
+                    /*
+                    * g_filename_from_uri() rejects escaped/locale encoded uri
+                    * string which come from Nautilus.
+                    */
+                                       if (g_utf8_validate(file, -1, NULL))
+                                               locale_file
+                                                       = conv_codeset_strdup(
+                                                               file + 5,
+                                                               CS_UTF_8,
+                                                               conv_get_locale_charset_str());
+                                       if (!locale_file)
+                                               locale_file = g_strdup(file + 5);
+                                       result = g_list_append(result, locale_file);
                                }
                        }
                }
@@ -1406,31 +1723,113 @@ GList *uri_list_extract_filenames(const gchar *uri_list)
        return result;
 }
 
-#define HEX_TO_INT(val, hex) \
-{ \
-       gchar c = hex; \
- \
-       if ('0' <= c && c <= '9') { \
-               val = c - '0'; \
-       } else if ('a' <= c && c <= 'f') { \
-               val = c - 'a' + 10; \
-       } else if ('A' <= c && c <= 'F') { \
-               val = c - 'A' + 10; \
-       } else { \
-               val = 0; \
-       } \
+/* Converts two-digit hexadecimal to decimal.  Used for unescaping escaped
+ * characters
+ */
+static gint axtoi(const gchar *hexstr)
+{
+       gint hi, lo, result;
+
+       hi = hexstr[0];
+       if ('0' <= hi && hi <= '9') {
+               hi -= '0';
+       } else
+               if ('a' <= hi && hi <= 'f') {
+                       hi -= ('a' - 10);
+               } else
+                       if ('A' <= hi && hi <= 'F') {
+                               hi -= ('A' - 10);
+                       }
+
+       lo = hexstr[1];
+       if ('0' <= lo && lo <= '9') {
+               lo -= '0';
+       } else
+               if ('a' <= lo && lo <= 'f') {
+                       lo -= ('a'-10);
+               } else
+                       if ('A' <= lo && lo <= 'F') {
+                               lo -= ('A' - 10);
+                       }
+       result = lo + (16 * hi);
+       return result;
 }
 
-gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
-                    gchar **subject, gchar **body)
+gboolean is_uri_string(const gchar *str)
 {
-       gchar *tmp_mailto;
-       gchar *p;
-
-       Xstrdup_a(tmp_mailto, mailto, return -1);
+       return (g_ascii_strncasecmp(str, "http://", 7) == 0 ||
+               g_ascii_strncasecmp(str, "https://", 8) == 0 ||
+               g_ascii_strncasecmp(str, "ftp://", 6) == 0 ||
+               g_ascii_strncasecmp(str, "www.", 4) == 0);
+}
 
-       if (!strncmp(tmp_mailto, "mailto:", 7))
-               tmp_mailto += 7;
+gchar *get_uri_path(const gchar *uri)
+{
+       if (g_ascii_strncasecmp(uri, "http://", 7) == 0)
+               return (gchar *)(uri + 7);
+       else if (g_ascii_strncasecmp(uri, "https://", 8) == 0)
+               return (gchar *)(uri + 8);
+       else if (g_ascii_strncasecmp(uri, "ftp://", 6) == 0)
+               return (gchar *)(uri + 6);
+       else
+               return (gchar *)uri;
+}
+
+gint get_uri_len(const gchar *str)
+{
+       const gchar *p;
+
+       if (is_uri_string(str)) {
+               for (p = str; *p != '\0'; p++) {
+                       if (!g_ascii_isgraph(*p) || strchr("()<>\"", *p))
+                               break;
+               }
+               return p - str;
+       }
+
+       return 0;
+}
+
+/* Decodes URL-Encoded strings (i.e. strings in which spaces are replaced by
+ * plusses, and escape characters are used)
+ */
+void decode_uri(gchar *decoded_uri, const gchar *encoded_uri)
+{
+       gchar *dec = decoded_uri;
+       const gchar *enc = encoded_uri;
+
+       while (*enc) {
+               if (*enc == '%') {
+                       enc++;
+                       if (isxdigit((guchar)enc[0]) &&
+                           isxdigit((guchar)enc[1])) {
+                               *dec = axtoi(enc);
+                               dec++;
+                               enc += 2;
+                       }
+               } else {
+                       if (*enc == '+')
+                               *dec = ' ';
+                       else
+                               *dec = *enc;
+                       dec++;
+                       enc++;
+               }
+       }
+
+       *dec = '\0';
+}
+
+gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
+                    gchar **subject, gchar **body)
+{
+       gchar *tmp_mailto;
+       gchar *p;
+
+       Xstrdup_a(tmp_mailto, mailto, return -1);
+
+       if (!strncmp(tmp_mailto, "mailto:", 7))
+               tmp_mailto += 7;
 
        p = strchr(tmp_mailto, '?');
        if (p) {
@@ -1461,15 +1860,15 @@ gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
 
                if (*value == '\0') continue;
 
-               if (cc && !*cc && !g_strcasecmp(field, "cc")) {
+               if (cc && !*cc && !g_ascii_strcasecmp(field, "cc")) {
                        *cc = g_strdup(value);
-               } else if (bcc && !*bcc && !g_strcasecmp(field, "bcc")) {
+               } else if (bcc && !*bcc && !g_ascii_strcasecmp(field, "bcc")) {
                        *bcc = g_strdup(value);
                } else if (subject && !*subject &&
-                          !g_strcasecmp(field, "subject")) {
+                          !g_ascii_strcasecmp(field, "subject")) {
                        *subject = g_malloc(strlen(value) + 1);
                        decode_uri(*subject, value);
-               } else if (body && !*body && !g_strcasecmp(field, "body")) {
+               } else if (body && !*body && !g_ascii_strcasecmp(field, "body")) {
                        *body = g_malloc(strlen(value) + 1);
                        decode_uri(*body, value);
                }
@@ -1478,38 +1877,129 @@ gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
        return 0;
 }
 
-/*
- * We need this wrapper around g_get_home_dir(), so that
- * we can fix some Windoze things here.  Should be done in glibc of course
- * but as long as we are not able to do our own extensions to glibc, we do
- * it here.
- */
-gchar *get_home_dir(void)
-{
-#if HAVE_DOSISH_SYSTEM
-    static gchar *home_dir;
-
-    if (!home_dir) {
-        home_dir = read_w32_registry_string(NULL,
-                                            "Software\\Sylpheed", "HomeDir" );
-        if (!home_dir || !*home_dir) {
-            if (getenv ("HOMEDRIVE") && getenv("HOMEPATH")) {
-                const char *s = g_get_home_dir();
-                if (s && *s)
-                    home_dir = g_strdup (s);
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#ifndef CSIDL_APPDATA
+#define CSIDL_APPDATA 0x001a
+#endif
+#ifndef CSIDL_LOCAL_APPDATA
+#define CSIDL_LOCAL_APPDATA 0x001c
+#endif
+#ifndef CSIDL_FLAG_CREATE
+#define CSIDL_FLAG_CREATE 0x8000
+#endif
+#define DIM(v)              (sizeof(v)/sizeof((v)[0]))
+
+#define RTLD_LAZY 0
+const char *
+w32_strerror (int w32_errno)
+{
+  static char strerr[256];
+  int ec = (int)GetLastError ();
+
+  if (w32_errno == 0)
+    w32_errno = ec;
+  FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, w32_errno,
+                 MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
+                 strerr, DIM (strerr)-1, NULL);
+  return strerr;
+}
+
+static __inline__ void *
+dlopen (const char * name, int flag)
+{
+  void * hd = LoadLibrary (name);
+  return hd;
+}
+
+static __inline__ void *
+dlsym (void * hd, const char * sym)
+{
+  if (hd && sym)
+    {
+      void * fnc = GetProcAddress (hd, sym);
+      if (!fnc)
+        return NULL;
+      return fnc;
+    }
+  return NULL;
+}
+
+
+static __inline__ const char *
+dlerror (void)
+{
+  return w32_strerror (0);
+}
+
+
+static __inline__ int
+dlclose (void * hd)
+{
+  if (hd)
+    {
+      FreeLibrary (hd);
+      return 0;
+    }
+  return -1;
+}
+
+static HRESULT
+w32_shgetfolderpath (HWND a, int b, HANDLE c, DWORD d, LPSTR e)
+{
+  static int initialized;
+  static HRESULT (WINAPI * func)(HWND,int,HANDLE,DWORD,LPSTR);
+
+  if (!initialized)
+    {
+      static char *dllnames[] = { "shell32.dll", "shfolder.dll", NULL };
+      void *handle;
+      int i;
+
+      initialized = 1;
+
+      for (i=0, handle = NULL; !handle && dllnames[i]; i++)
+        {
+          handle = dlopen (dllnames[i], RTLD_LAZY);
+          if (handle)
+            {
+              func = dlsym (handle, "SHGetFolderPathA");
+              if (!func)
+                {
+                  dlclose (handle);
+                  handle = NULL;
+                }
             }
-            if (!home_dir || !*home_dir) 
-                home_dir = g_strdup ("c:\\sylpheed");
         }
-        debug_print("initialized home_dir to `%s'\n", home_dir);
     }
-    return home_dir;
-#else /* standard glib */
-    return g_get_home_dir();
+
+  if (func)
+    return func (a,b,c,d,e);
+  else
+    return -1;
+}
+#endif
+
+const gchar *get_home_dir(void)
+{
+#ifdef G_OS_WIN32
+       static char home_dir[MAX_PATH] = "";
+
+       if (home_dir[0] == '\0')
+               {
+                       if (w32_shgetfolderpath
+                           (NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE,
+                            NULL, 0, home_dir) < 0)
+                               strcpy (home_dir, "C:\\Sylpheed");
+       }
+       return home_dir;
+#else
+       return g_get_home_dir();
 #endif
 }
 
-gchar *get_rc_dir(void)
+const gchar *get_rc_dir(void)
 {
        static gchar *rc_dir = NULL;
 
@@ -1520,7 +2010,22 @@ gchar *get_rc_dir(void)
        return rc_dir;
 }
 
-gchar *get_news_cache_dir(void)
+const gchar *get_mail_base_dir(void)
+{
+#ifdef G_OS_WIN32
+       static gchar *mail_base_dir = NULL;
+
+       if (!mail_base_dir)
+               mail_base_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+                                           "Mailboxes", NULL);
+
+       return mail_base_dir;
+#else
+       return get_home_dir();
+#endif
+}
+
+const gchar *get_news_cache_dir(void)
 {
        static gchar *news_cache_dir = NULL;
 
@@ -1531,7 +2036,7 @@ gchar *get_news_cache_dir(void)
        return news_cache_dir;
 }
 
-gchar *get_imap_cache_dir(void)
+const gchar *get_imap_cache_dir(void)
 {
        static gchar *imap_cache_dir = NULL;
 
@@ -1542,7 +2047,7 @@ gchar *get_imap_cache_dir(void)
        return imap_cache_dir;
 }
 
-gchar *get_mbox_cache_dir(void)
+const gchar *get_mbox_cache_dir(void)
 {
        static gchar *mbox_cache_dir = NULL;
 
@@ -1553,7 +2058,7 @@ gchar *get_mbox_cache_dir(void)
        return mbox_cache_dir;
 }
 
-gchar *get_mime_tmp_dir(void)
+const gchar *get_mime_tmp_dir(void)
 {
        static gchar *mime_tmp_dir = NULL;
 
@@ -1564,7 +2069,7 @@ gchar *get_mime_tmp_dir(void)
        return mime_tmp_dir;
 }
 
-gchar *get_template_dir(void)
+const gchar *get_template_dir(void)
 {
        static gchar *template_dir = NULL;
 
@@ -1575,7 +2080,7 @@ gchar *get_template_dir(void)
        return template_dir;
 }
 
-gchar *get_header_cache_dir(void)
+const gchar *get_header_cache_dir(void)
 {
        static gchar *header_dir = NULL;
 
@@ -1586,7 +2091,23 @@ gchar *get_header_cache_dir(void)
        return header_dir;
 }
 
-gchar *get_tmp_dir(void)
+/* Return the default directory for Plugins. */
+const gchar *get_plugin_dir(void)
+{
+#ifdef G_OS_WIN32
+       static gchar *plugin_dir = NULL;
+
+       if (!plugin_dir)
+                plugin_dir = g_strconcat(sylpheed_get_startup_dir(),
+                                         "\\lib\\sylpheed-claws\\plugins\\",
+                                         NULL);
+       return plugin_dir;
+#else
+        return PLUGINDIR;
+#endif
+}
+
+const gchar *get_tmp_dir(void)
 {
        static gchar *tmp_dir = NULL;
 
@@ -1608,22 +2129,22 @@ gchar *get_tmp_file(void)
        return tmp_file;
 }
 
-gchar *get_domain_name(void)
+const gchar *get_domain_name(void)
 {
+#ifdef G_OS_UNIX
        static gchar *domain_name = NULL;
 
        if (!domain_name) {
-               gchar buf[128] = "";
                struct hostent *hp;
+               struct utsname uts;
 
-               if (gethostname(buf, sizeof(buf)) < 0) {
-                       perror("gethostname");
+               if (uname(&uts) < 0) {
+                       perror("uname");
                        domain_name = "unknown";
                } else {
-                       buf[sizeof(buf) - 1] = '\0';
-                       if ((hp = my_gethostbyname(buf)) == NULL) {
+                       if ((hp = my_gethostbyname(uts.nodename)) == NULL) {
                                perror("gethostbyname");
-                               domain_name = g_strdup(buf);
+                               domain_name = g_strdup(uts.nodename);
                        } else {
                                domain_name = g_strdup(hp->h_name);
                        }
@@ -1633,13 +2154,16 @@ gchar *get_domain_name(void)
        }
 
        return domain_name;
+#else
+       return "unknown";
+#endif
 }
 
 off_t get_file_size(const gchar *file)
 {
        struct stat s;
 
-       if (stat(file, &s) < 0) {
+       if (g_stat(file, &s) < 0) {
                FILE_OP_ERROR(file, "stat");
                return -1;
        }
@@ -1653,7 +2177,7 @@ off_t get_file_size_as_crlf(const gchar *file)
        off_t size = 0;
        gchar buf[BUFFSIZE];
 
-       if ((fp = fopen(file, "rb")) == NULL) {
+       if ((fp = g_fopen(file, "rb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
                return -1;
        }
@@ -1707,7 +2231,7 @@ gboolean file_exist(const gchar *file, gboolean allow_fifo)
        if (file == NULL)
                return FALSE;
 
-       if (stat(file, &s) < 0) {
+       if (g_stat(file, &s) < 0) {
                if (ENOENT != errno) FILE_OP_ERROR(file, "stat");
                return FALSE;
        }
@@ -1718,37 +2242,68 @@ gboolean file_exist(const gchar *file, gboolean allow_fifo)
        return FALSE;
 }
 
-gboolean is_dir_exist(const gchar *dir)
+
+/* Test on whether FILE is a relative file name. This is
+ * straightforward for Unix but more complex for Windows. */
+gboolean is_relative_filename(const gchar *file)
 {
-       struct stat s;
+        if (!file)
+                return TRUE;
+#ifdef G_OS_WIN32
+        if ( *file == '\\' && file[1] == '\\' && strchr (file+2, '\\') )
+                return FALSE; /* Prefixed with a hostname - this can't
+                               * be a relative name. */
 
-       if (dir == NULL)
-               return FALSE;
+        if ( ((*file >= 'a' && *file <= 'z')
+              || (*file >= 'A' && *file <= 'Z'))
+             && file[1] == ':')
+                file += 2;  /* Skip drive letter. */
 
-       if (stat(dir, &s) < 0) {
-               if (ENOENT != errno) FILE_OP_ERROR(dir, "stat");
-               return FALSE;
-       }
+        return !(*file == '\\' || *file == '/');
+#else
+        return !(*file == G_DIR_SEPARATOR);
+#endif
+}
 
-       if (S_ISDIR(s.st_mode))
-               return TRUE;
 
-       return FALSE;
+gboolean is_dir_exist(const gchar *dir)
+{
+       if (dir == NULL)
+               return FALSE;
+
+       return g_file_test(dir, G_FILE_TEST_IS_DIR);
 }
 
 gboolean is_file_entry_exist(const gchar *file)
 {
-       struct stat s;
-
        if (file == NULL)
                return FALSE;
 
-       if (stat(file, &s) < 0) {
-               if (ENOENT != errno) FILE_OP_ERROR(file, "stat");
+       return g_file_test(file, G_FILE_TEST_EXISTS);
+}
+
+gboolean dirent_is_regular_file(struct dirent *d)
+{
+#ifdef HAVE_DIRENT_D_TYPE
+       if (d->d_type == DT_REG)
+               return TRUE;
+       else if (d->d_type != DT_UNKNOWN)
                return FALSE;
-       }
+#endif
 
-       return TRUE;
+       return g_file_test(d->d_name, G_FILE_TEST_IS_REGULAR);
+}
+
+gboolean dirent_is_directory(struct dirent *d)
+{
+#ifdef HAVE_DIRENT_D_TYPE
+       if (d->d_type == DT_DIR)
+               return TRUE;
+       else if (d->d_type != DT_UNKNOWN)
+               return FALSE;
+#endif
+
+       return g_file_test(d->d_name, G_FILE_TEST_IS_DIR);
 }
 
 gint change_dir(const gchar *dir)
@@ -1758,7 +2313,7 @@ gint change_dir(const gchar *dir)
        if (debug_mode)
                prevdir = g_get_current_dir();
 
-       if (chdir(dir) < 0) {
+       if (g_chdir(dir) < 0) {
                FILE_OP_ERROR(dir, "chdir");
                if (debug_mode) g_free(prevdir);
                return -1;
@@ -1777,11 +2332,11 @@ gint change_dir(const gchar *dir)
 
 gint make_dir(const gchar *dir)
 {
-       if (mkdir(dir, S_IRWXU) < 0) {
+       if (g_mkdir(dir, S_IRWXU) < 0) {
                FILE_OP_ERROR(dir, "mkdir");
                return -1;
        }
-       if (chmod(dir, S_IRWXU) < 0)
+       if (g_chmod(dir, S_IRWXU) < 0)
                FILE_OP_ERROR(dir, "chmod");
 
        return 0;
@@ -1815,36 +2370,32 @@ gint make_dir_hier(const gchar *dir)
 
 gint remove_all_files(const gchar *dir)
 {
-       DIR *dp;
-       struct dirent *d;
+       GDir *dp;
+       const gchar *dir_name;
        gchar *prev_dir;
 
        prev_dir = g_get_current_dir();
 
-       if (chdir(dir) < 0) {
+       if (g_chdir(dir) < 0) {
                FILE_OP_ERROR(dir, "chdir");
                g_free(prev_dir);
                return -1;
        }
 
-       if ((dp = opendir(".")) == NULL) {
-               FILE_OP_ERROR(dir, "opendir");
+       if ((dp = g_dir_open(".", 0, NULL)) == NULL) {
+               g_warning("failed to open directory: %s\n", dir);
                g_free(prev_dir);
                return -1;
        }
 
-       while ((d = readdir(dp)) != NULL) {
-               if (!strcmp(d->d_name, ".") ||
-                   !strcmp(d->d_name, ".."))
-                       continue;
-
-               if (unlink(d->d_name) < 0)
-                       FILE_OP_ERROR(d->d_name, "unlink");
+       while ((dir_name = g_dir_read_name(dp)) != NULL) {
+               if (g_unlink(dir_name) < 0)
+                       FILE_OP_ERROR(dir_name, "unlink");
        }
 
-       closedir(dp);
+       g_dir_close(dp);
 
-       if (chdir(prev_dir) < 0) {
+       if (g_chdir(prev_dir) < 0) {
                FILE_OP_ERROR(prev_dir, "chdir");
                g_free(prev_dir);
                return -1;
@@ -1857,38 +2408,38 @@ gint remove_all_files(const gchar *dir)
 
 gint remove_numbered_files(const gchar *dir, guint first, guint last)
 {
-       DIR *dp;
-       struct dirent *d;
+       GDir *dp;
+       const gchar *dir_name;
        gchar *prev_dir;
-       gint fileno;
+       gint file_no;
 
        prev_dir = g_get_current_dir();
 
-       if (chdir(dir) < 0) {
+       if (g_chdir(dir) < 0) {
                FILE_OP_ERROR(dir, "chdir");
                g_free(prev_dir);
                return -1;
        }
 
-       if ((dp = opendir(".")) == NULL) {
-               FILE_OP_ERROR(dir, "opendir");
+       if ((dp = g_dir_open(".", 0, NULL)) == NULL) {
+               g_warning("failed to open directory: %s\n", dir);
                g_free(prev_dir);
                return -1;
        }
 
-       while ((d = readdir(dp)) != NULL) {
-               fileno = to_number(d->d_name);
-               if (fileno >= 0 && first <= fileno && fileno <= last) {
-                       if (is_dir_exist(d->d_name))
+       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))
                                continue;
-                       if (unlink(d->d_name) < 0)
-                               FILE_OP_ERROR(d->d_name, "unlink");
+                       if (g_unlink(dir_name) < 0)
+                               FILE_OP_ERROR(dir_name, "unlink");
                }
        }
 
-       closedir(dp);
+       g_dir_close(dp);
 
-       if (chdir(prev_dir) < 0) {
+       if (g_chdir(prev_dir) < 0) {
                FILE_OP_ERROR(prev_dir, "chdir");
                g_free(prev_dir);
                return -1;
@@ -1901,39 +2452,39 @@ gint remove_numbered_files(const gchar *dir, guint first, guint last)
 
 gint remove_numbered_files_not_in_list(const gchar *dir, GSList *numberlist)
 {
-       DIR *dp;
-       struct dirent *d;
+       GDir *dp;
+       const gchar *dir_name;
        gchar *prev_dir;
-       gint fileno;
+       gint file_no;
 
        prev_dir = g_get_current_dir();
 
-       if (chdir(dir) < 0) {
+       if (g_chdir(dir) < 0) {
                FILE_OP_ERROR(dir, "chdir");
                g_free(prev_dir);
                return -1;
        }
 
-       if ((dp = opendir(".")) == NULL) {
+       if ((dp = g_dir_open(".", 0, NULL)) == NULL) {
                FILE_OP_ERROR(dir, "opendir");
                g_free(prev_dir);
                return -1;
        }
 
-       while ((d = readdir(dp)) != NULL) {
-               fileno = to_number(d->d_name);
-               if (fileno >= 0 && (g_slist_find(numberlist, GINT_TO_POINTER(fileno)) == NULL)) {
-                       debug_print("removing unwanted file %d from %s\n", fileno, dir);
-                       if (is_dir_exist(d->d_name))
+       while ((dir_name = g_dir_read_name(dp)) != NULL) {
+               file_no = to_number(dir_name);
+               if (file_no > 0 && (g_slist_find(numberlist, GINT_TO_POINTER(file_no)) == NULL)) {
+                       debug_print("removing unwanted file %d from %s\n", file_no, dir);
+                       if (is_dir_exist(dir_name))
                                continue;
-                       if (unlink(d->d_name) < 0)
-                               FILE_OP_ERROR(d->d_name, "unlink");
+                       if (g_unlink(dir_name) < 0)
+                               FILE_OP_ERROR(dir_name, "unlink");
                }
        }
 
-       closedir(dp);
+       g_dir_close(dp);
 
-       if (chdir(prev_dir) < 0) {
+       if (g_chdir(prev_dir) < 0) {
                FILE_OP_ERROR(prev_dir, "chdir");
                g_free(prev_dir);
                return -1;
@@ -1951,23 +2502,23 @@ gint remove_all_numbered_files(const gchar *dir)
 
 gint remove_expired_files(const gchar *dir, guint hours)
 {
-       DIR *dp;
-       struct dirent *d;
+       GDir *dp;
+       const gchar *dir_name;
        struct stat s;
        gchar *prev_dir;
-       gint fileno;
+       gint file_no;
        time_t mtime, now, expire_time;
 
        prev_dir = g_get_current_dir();
 
-       if (chdir(dir) < 0) {
+       if (g_chdir(dir) < 0) {
                FILE_OP_ERROR(dir, "chdir");
                g_free(prev_dir);
                return -1;
        }
 
-       if ((dp = opendir(".")) == NULL) {
-               FILE_OP_ERROR(dir, "opendir");
+       if ((dp = g_dir_open(".", 0, NULL)) == NULL) {
+               g_warning("failed to open directory: %s\n", dir);
                g_free(prev_dir);
                return -1;
        }
@@ -1975,26 +2526,26 @@ gint remove_expired_files(const gchar *dir, guint hours)
        now = time(NULL);
        expire_time = hours * 60 * 60;
 
-       while ((d = readdir(dp)) != NULL) {
-               fileno = to_number(d->d_name);
-               if (fileno >= 0) {
-                       if (stat(d->d_name, &s) < 0) {
-                               FILE_OP_ERROR(d->d_name, "stat");
+       while ((dir_name = g_dir_read_name(dp)) != NULL) {
+               file_no = to_number(dir_name);
+               if (file_no > 0) {
+                       if (g_stat(dir_name, &s) < 0) {
+                               FILE_OP_ERROR(dir_name, "stat");
                                continue;
                        }
                        if (S_ISDIR(s.st_mode))
                                continue;
                        mtime = MAX(s.st_mtime, s.st_atime);
                        if (now - mtime > expire_time) {
-                               if (unlink(d->d_name) < 0)
-                                       FILE_OP_ERROR(d->d_name, "unlink");
+                               if (g_unlink(dir_name) < 0)
+                                       FILE_OP_ERROR(dir_name, "unlink");
                        }
                }
        }
 
-       closedir(dp);
+       g_dir_close(dp);
 
-       if (chdir(prev_dir) < 0) {
+       if (g_chdir(prev_dir) < 0) {
                FILE_OP_ERROR(prev_dir, "chdir");
                g_free(prev_dir);
                return -1;
@@ -2008,20 +2559,18 @@ gint remove_expired_files(const gchar *dir, guint hours)
 gint remove_dir_recursive(const gchar *dir)
 {
        struct stat s;
-       DIR *dp;
-       struct dirent *d;
+       GDir *dp;
+       const gchar *dir_name;
        gchar *prev_dir;
 
-       /* g_print("dir = %s\n", dir); */
-
-       if (stat(dir, &s) < 0) {
+       if (g_stat(dir, &s) < 0) {
                FILE_OP_ERROR(dir, "stat");
                if (ENOENT == errno) return 0;
                return -1;
        }
 
        if (!S_ISDIR(s.st_mode)) {
-               if (unlink(dir) < 0) {
+               if (g_unlink(dir) < 0) {
                        FILE_OP_ERROR(dir, "unlink");
                        return -1;
                }
@@ -2034,53 +2583,44 @@ gint remove_dir_recursive(const gchar *dir)
 
        if (!path_cmp(prev_dir, dir)) {
                g_free(prev_dir);
-               if (chdir("..") < 0) {
+               if (g_chdir("..") < 0) {
                        FILE_OP_ERROR(dir, "chdir");
                        return -1;
                }
                prev_dir = g_get_current_dir();
        }
 
-       if (chdir(dir) < 0) {
+       if (g_chdir(dir) < 0) {
                FILE_OP_ERROR(dir, "chdir");
                g_free(prev_dir);
                return -1;
        }
 
-       if ((dp = opendir(".")) == NULL) {
-               FILE_OP_ERROR(dir, "opendir");
-               chdir(prev_dir);
+       if ((dp = g_dir_open(".", 0, NULL)) == NULL) {
+               g_warning("failed to open directory: %s\n", dir);
+               g_chdir(prev_dir);
                g_free(prev_dir);
                return -1;
        }
 
        /* remove all files in the directory */
-       while ((d = readdir(dp)) != NULL) {
-               if (!strcmp(d->d_name, ".") ||
-                   !strcmp(d->d_name, ".."))
-                       continue;
-
-               if (stat(d->d_name, &s) < 0) {
-                       FILE_OP_ERROR(d->d_name, "stat");
-                       continue;
-               }
+       while ((dir_name = g_dir_read_name(dp)) != NULL) {
+               /* g_print("removing %s\n", dir_name); */
 
-               /* g_print("removing %s\n", d->d_name); */
-
-               if (S_ISDIR(s.st_mode)) {
-                       if (remove_dir_recursive(d->d_name) < 0) {
+               if (is_dir_exist(dir_name)) {
+                       if (remove_dir_recursive(dir_name) < 0) {
                                g_warning("can't remove directory\n");
                                return -1;
                        }
                } else {
-                       if (unlink(d->d_name) < 0)
-                               FILE_OP_ERROR(d->d_name, "unlink");
+                       if (g_unlink(dir_name) < 0)
+                               FILE_OP_ERROR(dir_name, "unlink");
                }
        }
 
-       closedir(dp);
+       g_dir_close(dp);
 
-       if (chdir(prev_dir) < 0) {
+       if (g_chdir(prev_dir) < 0) {
                FILE_OP_ERROR(prev_dir, "chdir");
                g_free(prev_dir);
                return -1;
@@ -2088,7 +2628,7 @@ gint remove_dir_recursive(const gchar *dir)
 
        g_free(prev_dir);
 
-       if (rmdir(dir) < 0) {
+       if (g_rmdir(dir) < 0) {
                FILE_OP_ERROR(dir, "rmdir");
                return -1;
        }
@@ -2096,84 +2636,20 @@ gint remove_dir_recursive(const gchar *dir)
        return 0;
 }
 
-#if 0
-/* this seems to be slower than the stdio version... */
-gint copy_file(const gchar *src, const gchar *dest)
+gint rename_force(const gchar *oldpath, const gchar *newpath)
 {
-       gint src_fd, dest_fd;
-       gint n_read;
-       gint n_write;
-       gchar buf[BUFSIZ];
-       gchar *dest_bak = NULL;
-
-       if ((src_fd = open(src, O_RDONLY)) < 0) {
-               FILE_OP_ERROR(src, "open");
-               return -1;
-       }
-
-       if (is_file_exist(dest)) {
-               dest_bak = g_strconcat(dest, ".bak", NULL);
-               if (rename(dest, dest_bak) < 0) {
-                       FILE_OP_ERROR(dest, "rename");
-                       close(src_fd);
-                       g_free(dest_bak);
-                       return -1;
-               }
-       }
-
-       if ((dest_fd = open(dest, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR)) < 0) {
-               FILE_OP_ERROR(dest, "open");
-               close(src_fd);
-               if (dest_bak) {
-                       if (rename(dest_bak, dest) < 0)
-                               FILE_OP_ERROR(dest_bak, "rename");
-                       g_free(dest_bak);
-               }
+#ifndef G_OS_UNIX
+       if (!is_file_entry_exist(oldpath)) {
+               errno = ENOENT;
                return -1;
        }
-
-       while ((n_read = read(src_fd, buf, sizeof(buf))) > 0) {
-               gint len = n_read;
-               gchar *bufp = buf;
-
-               while (len > 0) {
-                       n_write = write(dest_fd, bufp, len);
-                       if (n_write <= 0) {
-                               g_warning("writing to %s failed.\n", dest);
-                               close(dest_fd);
-                               close(src_fd);
-                               unlink(dest);
-                               if (dest_bak) {
-                                       if (rename(dest_bak, dest) < 0)
-                                               FILE_OP_ERROR(dest_bak, "rename");
-                                       g_free(dest_bak);
-                               }
-                               return -1;
-                       }
-                       len -= n_write;
-                       bufp += n_write;
-               }
-       }
-
-       close(src_fd);
-       close(dest_fd);
-
-       if (n_read < 0 || get_file_size(src) != get_file_size(dest)) {
-               g_warning("File copy from %s to %s failed.\n", src, dest);
-               unlink(dest);
-               if (dest_bak) {
-                       if (rename(dest_bak, dest) < 0)
-                               FILE_OP_ERROR(dest_bak, "rename");
-                       g_free(dest_bak);
-               }
-               return -1;
+       if (is_file_exist(newpath)) {
+               if (g_unlink(newpath) < 0)
+                       FILE_OP_ERROR(newpath, "unlink");
        }
-       g_free(dest_bak);
-
-       return 0;
-}
 #endif
-
+       return g_rename(oldpath, newpath);
+}
 
 /*
  * Append src file body to the tail of dest file.
@@ -2187,12 +2663,12 @@ gint append_file(const gchar *src, const gchar *dest, gboolean keep_backup)
 
        gboolean err = FALSE;
 
-       if ((src_fp = fopen(src, "rb")) == NULL) {
+       if ((src_fp = g_fopen(src, "rb")) == NULL) {
                FILE_OP_ERROR(src, "fopen");
                return -1;
        }
-       
-       if ((dest_fp = fopen(dest, "ab")) == NULL) {
+
+       if ((dest_fp = g_fopen(dest, "ab")) == NULL) {
                FILE_OP_ERROR(dest, "fopen");
                fclose(src_fp);
                return -1;
@@ -2206,11 +2682,11 @@ gint append_file(const gchar *src, const gchar *dest, gboolean keep_backup)
        while ((n_read = fread(buf, sizeof(gchar), sizeof(buf), src_fp)) > 0) {
                if (n_read < sizeof(buf) && ferror(src_fp))
                        break;
-               if (fwrite(buf, n_read, 1, dest_fp) < 1) {
+               if (fwrite(buf, 1, n_read, dest_fp) < n_read) {
                        g_warning("writing to %s failed.\n", dest);
                        fclose(dest_fp);
                        fclose(src_fp);
-                       unlink(dest);
+                       g_unlink(dest);
                        return -1;
                }
        }
@@ -2226,7 +2702,7 @@ gint append_file(const gchar *src, const gchar *dest, gboolean keep_backup)
        }
 
        if (err) {
-               unlink(dest);
+               g_unlink(dest);
                return -1;
        }
 
@@ -2241,13 +2717,13 @@ gint copy_file(const gchar *src, const gchar *dest, gboolean keep_backup)
        gchar *dest_bak = NULL;
        gboolean err = FALSE;
 
-       if ((src_fp = fopen(src, "rb")) == NULL) {
+       if ((src_fp = g_fopen(src, "rb")) == NULL) {
                FILE_OP_ERROR(src, "fopen");
                return -1;
        }
        if (is_file_exist(dest)) {
                dest_bak = g_strconcat(dest, ".bak", NULL);
-               if (rename(dest, dest_bak) < 0) {
+               if (rename_force(dest, dest_bak) < 0) {
                        FILE_OP_ERROR(dest, "rename");
                        fclose(src_fp);
                        g_free(dest_bak);
@@ -2255,11 +2731,11 @@ gint copy_file(const gchar *src, const gchar *dest, gboolean keep_backup)
                }
        }
 
-       if ((dest_fp = fopen(dest, "wb")) == NULL) {
+       if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
                FILE_OP_ERROR(dest, "fopen");
                fclose(src_fp);
                if (dest_bak) {
-                       if (rename(dest_bak, dest) < 0)
+                       if (rename_force(dest_bak, dest) < 0)
                                FILE_OP_ERROR(dest_bak, "rename");
                        g_free(dest_bak);
                }
@@ -2274,13 +2750,13 @@ gint copy_file(const gchar *src, const gchar *dest, gboolean keep_backup)
        while ((n_read = fread(buf, sizeof(gchar), sizeof(buf), src_fp)) > 0) {
                if (n_read < sizeof(buf) && ferror(src_fp))
                        break;
-               if (fwrite(buf, n_read, 1, dest_fp) < 1) {
+               if (fwrite(buf, 1, n_read, dest_fp) < n_read) {
                        g_warning("writing to %s failed.\n", dest);
                        fclose(dest_fp);
                        fclose(src_fp);
-                       unlink(dest);
+                       g_unlink(dest);
                        if (dest_bak) {
-                               if (rename(dest_bak, dest) < 0)
+                               if (rename_force(dest_bak, dest) < 0)
                                        FILE_OP_ERROR(dest_bak, "rename");
                                g_free(dest_bak);
                        }
@@ -2299,9 +2775,9 @@ gint copy_file(const gchar *src, const gchar *dest, gboolean keep_backup)
        }
 
        if (err) {
-               unlink(dest);
+               g_unlink(dest);
                if (dest_bak) {
-                       if (rename(dest_bak, dest) < 0)
+                       if (rename_force(dest_bak, dest) < 0)
                                FILE_OP_ERROR(dest_bak, "rename");
                        g_free(dest_bak);
                }
@@ -2309,7 +2785,7 @@ gint copy_file(const gchar *src, const gchar *dest, gboolean keep_backup)
        }
 
        if (keep_backup == FALSE && dest_bak)
-               unlink(dest_bak);
+               g_unlink(dest_bak);
 
        g_free(dest_bak);
 
@@ -2323,7 +2799,7 @@ gint move_file(const gchar *src, const gchar *dest, gboolean overwrite)
                return -1;
        }
 
-       if (rename(src, dest) == 0) return 0;
+       if (rename_force(src, dest) == 0) return 0;
 
        if (EXDEV != errno) {
                FILE_OP_ERROR(src, "rename");
@@ -2332,44 +2808,29 @@ gint move_file(const gchar *src, const gchar *dest, gboolean overwrite)
 
        if (copy_file(src, dest, FALSE) < 0) return -1;
 
-       unlink(src);
+       g_unlink(src);
 
        return 0;
 }
 
-gint copy_file_part(FILE *fp, off_t offset, size_t length, const gchar *dest)
+gint copy_file_part_to_fp(FILE *fp, off_t offset, size_t length, FILE *dest_fp)
 {
-       FILE *dest_fp;
        gint n_read;
        gint bytes_left, to_read;
        gchar buf[BUFSIZ];
-       gboolean err = FALSE;
 
        if (fseek(fp, offset, SEEK_SET) < 0) {
                perror("fseek");
                return -1;
        }
 
-       if ((dest_fp = fopen(dest, "wb")) == NULL) {
-               FILE_OP_ERROR(dest, "fopen");
-               return -1;
-       }
-
-       if (change_file_mode_rw(dest_fp, dest) < 0) {
-               FILE_OP_ERROR(dest, "chmod");
-               g_warning("can't change file mode\n");
-       }
-
        bytes_left = length;
        to_read = MIN(bytes_left, sizeof(buf));
 
        while ((n_read = fread(buf, sizeof(gchar), to_read, fp)) > 0) {
                if (n_read < to_read && ferror(fp))
                        break;
-               if (fwrite(buf, n_read, 1, dest_fp) < 1) {
-                       g_warning("writing to %s failed.\n", dest);
-                       fclose(dest_fp);
-                       unlink(dest);
+               if (fwrite(buf, 1, n_read, dest_fp) < n_read) {
                        return -1;
                }
                bytes_left -= n_read;
@@ -2380,15 +2841,38 @@ gint copy_file_part(FILE *fp, off_t offset, size_t length, const gchar *dest)
 
        if (ferror(fp)) {
                perror("fread");
-               err = TRUE;
+               return -1;
        }
-       if (fclose(dest_fp) == EOF) {
+
+       return 0;
+}
+
+gint copy_file_part(FILE *fp, off_t offset, size_t length, const gchar *dest)
+{
+       FILE *dest_fp;
+       gboolean err = FALSE;
+
+       if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
+               FILE_OP_ERROR(dest, "fopen");
+               return -1;
+       }
+
+       if (change_file_mode_rw(dest_fp, dest) < 0) {
+               FILE_OP_ERROR(dest, "chmod");
+               g_warning("can't change file mode\n");
+       }
+
+       if (copy_file_part_to_fp(fp, offset, length, dest_fp) < 0)
+               err = TRUE;
+
+       if (!err && fclose(dest_fp) == EOF) {
                FILE_OP_ERROR(dest, "fclose");
                err = TRUE;
        }
 
        if (err) {
-               unlink(dest);
+               g_warning("writing to %s failed.\n", dest);
+               g_unlink(dest);
                return -1;
        }
 
@@ -2439,12 +2923,12 @@ gint canonicalize_file(const gchar *src, const gchar *dest)
        gboolean err = FALSE;
        gboolean last_linebreak = FALSE;
 
-       if ((src_fp = fopen(src, "rb")) == NULL) {
+       if ((src_fp = g_fopen(src, "rb")) == NULL) {
                FILE_OP_ERROR(src, "fopen");
                return -1;
        }
 
-       if ((dest_fp = fopen(dest, "wb")) == NULL) {
+       if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
                FILE_OP_ERROR(dest, "fopen");
                fclose(src_fp);
                return -1;
@@ -2469,8 +2953,8 @@ gint canonicalize_file(const gchar *src, const gchar *dest)
                        r = fputs(buf, dest_fp);
                } else {
                        if (len > 1) {
-                               r = fwrite(buf, len - 1, 1, dest_fp);
-                               if (r != 1)
+                               r = fwrite(buf, 1, len - 1, dest_fp);
+                               if (r != (len -1))
                                        r = EOF;
                        }
                        if (r != EOF)
@@ -2481,7 +2965,7 @@ gint canonicalize_file(const gchar *src, const gchar *dest)
                        g_warning("writing to %s failed.\n", dest);
                        fclose(dest_fp);
                        fclose(src_fp);
-                       unlink(dest);
+                       g_unlink(dest);
                        return -1;
                }
        }
@@ -2502,7 +2986,7 @@ gint canonicalize_file(const gchar *src, const gchar *dest)
        }
 
        if (err) {
-               unlink(dest);
+               g_unlink(dest);
                return -1;
        }
 
@@ -2522,7 +3006,7 @@ gint canonicalize_file_replace(const gchar *file)
 
        if (move_file(tmp_file, file, TRUE) < 0) {
                g_warning("can't replace %s .\n", file);
-               unlink(tmp_file);
+               g_unlink(tmp_file);
                g_free(tmp_file);
                return -1;
        }
@@ -2537,12 +3021,12 @@ gint uncanonicalize_file(const gchar *src, const gchar *dest)
        gchar buf[BUFFSIZE];
        gboolean err = FALSE;
 
-       if ((src_fp = fopen(src, "rb")) == NULL) {
+       if ((src_fp = g_fopen(src, "rb")) == NULL) {
                FILE_OP_ERROR(src, "fopen");
                return -1;
        }
 
-       if ((dest_fp = fopen(dest, "wb")) == NULL) {
+       if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
                FILE_OP_ERROR(dest, "fopen");
                fclose(src_fp);
                return -1;
@@ -2559,7 +3043,7 @@ gint uncanonicalize_file(const gchar *src, const gchar *dest)
                        g_warning("writing to %s failed.\n", dest);
                        fclose(dest_fp);
                        fclose(src_fp);
-                       unlink(dest);
+                       g_unlink(dest);
                        return -1;
                }
        }
@@ -2575,7 +3059,7 @@ gint uncanonicalize_file(const gchar *src, const gchar *dest)
        }
 
        if (err) {
-               unlink(dest);
+               g_unlink(dest);
                return -1;
        }
 
@@ -2595,7 +3079,7 @@ gint uncanonicalize_file_replace(const gchar *file)
 
        if (move_file(tmp_file, file, TRUE) < 0) {
                g_warning("can't replace %s .\n", file);
-               unlink(tmp_file);
+               g_unlink(tmp_file);
                g_free(tmp_file);
                return -1;
        }
@@ -2604,6 +3088,25 @@ gint uncanonicalize_file_replace(const gchar *file)
        return 0;
 }
 
+gchar *normalize_newlines(const gchar *str)
+{
+       const gchar *p = str;
+       gchar *out, *outp;
+
+       out = outp = g_malloc(strlen(str) + 1);
+       for (p = str; *p != '\0'; ++p) {
+               if (*p == '\r') {
+                       if (*(p + 1) != '\n')
+                               *outp++ = '\n';
+               } else
+                       *outp++ = *p;
+       }
+
+       *outp = '\0';
+
+       return out;
+}
+
 gchar *get_outgoing_rfc2822_str(FILE *fp)
 {
        gchar buf[BUFFSIZE];
@@ -2615,7 +3118,7 @@ gchar *get_outgoing_rfc2822_str(FILE *fp)
        /* output header part */
        while (fgets(buf, sizeof(buf), fp) != NULL) {
                strretchomp(buf);
-               if (!g_strncasecmp(buf, "Bcc:", 4)) {
+               if (!g_ascii_strncasecmp(buf, "Bcc:", 4)) {
                        gint next;
 
                        for (;;) {
@@ -2652,18 +3155,51 @@ gchar *get_outgoing_rfc2822_str(FILE *fp)
        return ret;
 }
 
+/*
+ * Create a new boundary in a way that it is very unlikely that this
+ * will occur in the following text.  It would be easy to ensure
+ * uniqueness if everything is either quoted-printable or base64
+ * encoded (note that conversion is allowed), but because MIME bodies
+ * may be nested, it may happen that the same boundary has already
+ * been used.
+ *
+ *   boundary := 0*69<bchars> bcharsnospace
+ *   bchars := bcharsnospace / " "
+ *   bcharsnospace := DIGIT / ALPHA / "'" / "(" / ")" /
+ *                    "+" / "_" / "," / "-" / "." /
+ *                    "/" / ":" / "=" / "?"
+ *
+ * some special characters removed because of buggy MTAs
+ */
+
+gchar *generate_mime_boundary(const gchar *prefix)
+{
+       static gchar tbl[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                            "abcdefghijklmnopqrstuvwxyz"
+                            "1234567890+_./=";
+       gchar buf_uniq[24];
+       gint i;
+
+       for (i = 0; i < sizeof(buf_uniq) - 1; i++)
+               buf_uniq[i] = tbl[g_random_int_range(0, sizeof(tbl) - 1)];
+       buf_uniq[i] = '\0';
+
+       return g_strdup_printf("%s_%s", prefix ? prefix : "MP",
+                              buf_uniq);
+}
+
 gint change_file_mode_rw(FILE *fp, const gchar *file)
 {
 #if HAVE_FCHMOD
        return fchmod(fileno(fp), S_IRUSR|S_IWUSR);
 #else
-       return chmod(file, S_IRUSR|S_IWUSR);
+       return g_chmod(file, S_IRUSR|S_IWUSR);
 #endif
 }
 
 FILE *my_tmpfile(void)
 {
-#if HAVE_MKSTEMP
+#if HAVE_MKSTEMP || defined(G_OS_WIN32)
        const gchar suffix[] = ".XXXXXX";
        const gchar *tmpdir;
        guint tmplen;
@@ -2676,6 +3212,8 @@ FILE *my_tmpfile(void)
        tmpdir = get_tmp_dir();
        tmplen = strlen(tmpdir);
        progname = g_get_prgname();
+       if (progname == NULL)
+               progname = "sylpheed-claws";
        proglen = strlen(progname);
        Xalloca(fname, tmplen + 1 + proglen + sizeof(suffix),
                return tmpfile());
@@ -2689,18 +3227,35 @@ FILE *my_tmpfile(void)
        if (fd < 0)
                return tmpfile();
 
-       unlink(fname);
+#ifndef G_OS_WIN32
+       g_unlink(fname);
+#endif
 
        fp = fdopen(fd, "w+b");
        if (!fp)
                close(fd);
        else
                return fp;
-#endif /* HAVE_MKSTEMP */
+#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%csylpheed.XXXXXX",
+                                          dir, G_DIR_SEPARATOR);
+       fd = mkstemp_name(template, filename);
+       g_free(template);
+#else
+       *filename = g_strdup_printf("%s%csylpheed.XXXXXX", dir, G_DIR_SEPARATOR);
+       fd = mkstemp(*filename);
+#endif
+       return fdopen(fd, "w+");
+}
+
 FILE *str_open_as_stream(const gchar *str)
 {
        FILE *fp;
@@ -2717,7 +3272,7 @@ FILE *str_open_as_stream(const gchar *str)
        len = strlen(str);
        if (len == 0) return fp;
 
-       if (fwrite(str, len, 1, fp) != 1) {
+       if (fwrite(str, 1, len, fp) != len) {
                FILE_OP_ERROR("str_open_as_stream", "fwrite");
                fclose(fp);
                return NULL;
@@ -2735,7 +3290,7 @@ gint str_write_to_file(const gchar *str, const gchar *file)
        g_return_val_if_fail(str != NULL, -1);
        g_return_val_if_fail(file != NULL, -1);
 
-       if ((fp = fopen(file, "wb")) == NULL) {
+       if ((fp = g_fopen(file, "wb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
                return -1;
        }
@@ -2746,16 +3301,16 @@ gint str_write_to_file(const gchar *str, const gchar *file)
                return 0;
        }
 
-       if (fwrite(str, len, 1, fp) != 1) {
+       if (fwrite(str, 1, len, fp) != len) {
                FILE_OP_ERROR(file, "fwrite");
                fclose(fp);
-               unlink(file);
+               g_unlink(file);
                return -1;
        }
 
        if (fclose(fp) == EOF) {
                FILE_OP_ERROR(file, "fclose");
-               unlink(file);
+               g_unlink(file);
                return -1;
        }
 
@@ -2769,7 +3324,7 @@ gchar *file_read_to_str(const gchar *file)
 
        g_return_val_if_fail(file != NULL, NULL);
 
-       if ((fp = fopen(file, "rb")) == NULL) {
+       if ((fp = g_fopen(file, "rb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
                return NULL;
        }
@@ -2784,7 +3339,7 @@ gchar *file_read_to_str(const gchar *file)
 gchar *file_read_stream_to_str(FILE *fp)
 {
        GByteArray *array;
-       gchar buf[BUFSIZ];
+       guchar buf[BUFSIZ];
        gint n_read;
        gchar *str;
 
@@ -2809,60 +3364,52 @@ gchar *file_read_stream_to_str(FILE *fp)
        str = (gchar *)array->data;
        g_byte_array_free(array, FALSE);
 
+       if (!g_utf8_validate(str, -1, NULL)) {
+               const gchar *src_codeset, *dest_codeset;
+               gchar *tmp = NULL;
+               src_codeset = conv_get_locale_charset_str();
+               dest_codeset = CS_UTF_8;
+               tmp = conv_codeset_strdup(str, src_codeset, dest_codeset);
+               g_free(str);
+               str = tmp;
+       }
+
        return str;
 }
 
 gint execute_async(gchar *const argv[])
 {
-       pid_t pid;
+       g_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
 
-       if ((pid = fork()) < 0) {
-               perror("fork");
+       if (g_spawn_async(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH,
+                         NULL, NULL, NULL, FALSE) == FALSE) {
+               g_warning("Can't execute command: %s\n", argv[0]);
                return -1;
        }
 
-       if (pid == 0) {                 /* child process */
-               pid_t gch_pid;
-
-               if ((gch_pid = fork()) < 0) {
-                       perror("fork");
-                       _exit(1);
-               }
-
-               if (gch_pid == 0) {     /* grandchild process */
-                       execvp(argv[0], argv);
-
-                       perror("execvp");
-                       _exit(1);
-               }
-
-               _exit(0);
-       }
-
-       waitpid(pid, NULL, 0);
-
        return 0;
 }
 
 gint execute_sync(gchar *const argv[])
 {
-       pid_t pid;
+       gint status;
 
-       if ((pid = fork()) < 0) {
-               perror("fork");
+       g_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
+
+       if (g_spawn_sync(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH,
+                        NULL, NULL, NULL, NULL, &status, NULL) == FALSE) {
+               g_warning("Can't execute command: %s\n", argv[0]);
                return -1;
        }
 
-       if (pid == 0) {         /* child process */
-               execvp(argv[0], argv);
-
-               perror("execvp");
-               _exit(1);
-       }
-
-       waitpid(pid, NULL, 0);
-
-       return 0;
+#ifdef G_OS_UNIX
+       if (WIFEXITED(status))
+               return WEXITSTATUS(status);
+       else
+               return -1;
+#else
+       return status;
+#endif
 }
 
 gint execute_command_line(const gchar *cmdline, gboolean async)
@@ -2870,17 +3417,38 @@ gint execute_command_line(const gchar *cmdline, gboolean async)
        gchar **argv;
        gint ret;
 
+       debug_print("execute_command_line(): executing: %s\n", cmdline);
+
        argv = strsplit_with_quote(cmdline, " ", 0);
 
        if (async)
                ret = execute_async(argv);
        else
                ret = execute_sync(argv);
+
        g_strfreev(argv);
 
        return ret;
 }
 
+gchar *get_command_output(const gchar *cmdline)
+{
+       gchar *child_stdout;
+       gint status;
+
+       g_return_val_if_fail(cmdline != NULL, NULL);
+
+       debug_print("get_command_output(): executing: %s\n", cmdline);
+
+       if (g_spawn_command_line_sync(cmdline, &child_stdout, NULL, &status,
+                                     NULL) == FALSE) {
+               g_warning("Can't execute command: %s\n", cmdline);
+               return NULL;
+       }
+
+       return child_stdout;
+}
+
 static gint is_unchanged_uri_char(char c)
 {
        switch (c) {
@@ -2907,7 +3475,7 @@ void encode_uri(gchar *encoded_uri, gint bufsize, const gchar *uri)
                }
                else {
                        char * hexa = "0123456789ABCDEF";
-                       
+
                        if (k + 4 >= bufsize)
                                break;
                        encoded_uri[k++] = '%';
@@ -2918,99 +3486,53 @@ void encode_uri(gchar *encoded_uri, gint bufsize, const gchar *uri)
        encoded_uri[k] = 0;
 }
 
-/* Converts two-digit hexadecimal to decimal.  Used for unescaping escaped 
- * characters
- */
-static gint axtoi(const gchar *hexstr)
+gint open_uri(const gchar *uri, const gchar *cmdline)
 {
-       gint hi, lo, result;
-       
-       hi = hexstr[0];
-       if ('0' <= hi && hi <= '9') {
-               hi -= '0';
-       } else
-               if ('a' <= hi && hi <= 'f') {
-                       hi -= ('a' - 10);
-               } else
-                       if ('A' <= hi && hi <= 'F') {
-                               hi -= ('A' - 10);
-                       }
-
-       lo = hexstr[1];
-       if ('0' <= lo && lo <= '9') {
-               lo -= '0';
-       } else
-               if ('a' <= lo && lo <= 'f') {
-                       lo -= ('a'-10);
-               } else
-                       if ('A' <= lo && lo <= 'F') {
-                               lo -= ('A' - 10);
-                       }
-       result = lo + (16 * hi);
-       return result;
-}
-
-
-/* Decodes URL-Encoded strings (i.e. strings in which spaces are replaced by
- * plusses, and escape characters are used)
- */
+       gchar buf[BUFFSIZE];
+       gchar *p;
+       gchar encoded_uri[BUFFSIZE];
 
-void decode_uri(gchar *decoded_uri, const gchar *encoded_uri)
-{
-       const gchar *encoded;
-       gchar *decoded;
+       g_return_val_if_fail(uri != NULL, -1);
 
-       encoded = encoded_uri;
-       decoded = decoded_uri;
+       /* an option to choose whether to use encode_uri or not ? */
+       encode_uri(encoded_uri, BUFFSIZE, uri);
 
-       while (*encoded) {
-               if (*encoded == '%') {
-                       encoded++;
-                       if (isxdigit(encoded[0])
-                           && isxdigit(encoded[1])) {
-                               *decoded = (gchar) axtoi(encoded);
-                               decoded++;
-                               encoded += 2;
-                       }
-               }
-               else if (*encoded == '+') {
-                       *decoded = ' ';
-                       decoded++;
-                       encoded++;
-               }
-               else {
-                       *decoded = *encoded;
-                       decoded++;
-                       encoded++;
-               }
+       if (cmdline &&
+           (p = strchr(cmdline, '%')) && *(p + 1) == 's' &&
+           !strchr(p + 2, '%'))
+               g_snprintf(buf, sizeof(buf), cmdline, encoded_uri);
+       else {
+               if (cmdline)
+                       g_warning("Open URI command line is invalid "
+                                 "(there must be only one '%%s'): %s",
+                                 cmdline);
+               g_snprintf(buf, sizeof(buf), DEFAULT_BROWSER_CMD, encoded_uri);
        }
 
-       *decoded = '\0';
-}
+       execute_command_line(buf, TRUE);
 
+       return 0;
+}
 
-gint open_uri(const gchar *uri, const gchar *cmdline)
+gint open_txt_editor(const gchar *filepath, const gchar *cmdline)
 {
        gchar buf[BUFFSIZE];
        gchar *p;
-       gchar encoded_uri[BUFFSIZE];
-       
-       g_return_val_if_fail(uri != NULL, -1);
 
-       /* an option to choose whether to use encode_uri or not ? */
-       encode_uri(encoded_uri, BUFFSIZE, uri);
-       
+       g_return_val_if_fail(filepath != NULL, -1);
+
        if (cmdline &&
            (p = strchr(cmdline, '%')) && *(p + 1) == 's' &&
            !strchr(p + 2, '%'))
-               g_snprintf(buf, sizeof(buf), cmdline, encoded_uri);
+               g_snprintf(buf, sizeof(buf), cmdline, filepath);
        else {
                if (cmdline)
-                       g_warning("Open URI command line is invalid: `%s'",
+                       g_warning("Open Text Editor command line is invalid "
+                                 "(there must be only one '%%s'): %s",
                                  cmdline);
-               g_snprintf(buf, sizeof(buf), DEFAULT_BROWSER_CMD, encoded_uri);
+               g_snprintf(buf, sizeof(buf), DEFAULT_EDITOR_CMD, filepath);
        }
-       
+
        execute_command_line(buf, TRUE);
 
        return 0;
@@ -3038,11 +3560,16 @@ time_t remote_tzoffset_sec(const gchar *zone)
        } else if (!strncmp(zone, "UT" , 2) ||
                   !strncmp(zone, "GMT", 2)) {
                remoteoffset = 0;
-       } else if (strlen(zone3) == 3 &&
-                  (p = strstr(ustzstr, zone3)) != NULL &&
-                  (p - ustzstr) % 3 == 0) {
-               iustz = ((gint)(p - ustzstr) / 3 + 1) / 2 - 8;
-               remoteoffset = iustz * 3600;
+       } else if (strlen(zone3) == 3) {
+               for (p = ustzstr; *p != '\0'; p += 3) {
+                       if (!g_ascii_strncasecmp(p, zone3, 3)) {
+                               iustz = ((gint)(p - ustzstr) / 3 + 1) / 2 - 8;
+                               remoteoffset = iustz * 3600;
+                               break;
+                       }
+               }
+               if (*p == '\0')
+                       return -1;
        } else if (strlen(zone3) == 1) {
                switch (zone[0]) {
                case 'Z': remoteoffset =   0; break;
@@ -3073,7 +3600,8 @@ time_t remote_tzoffset_sec(const gchar *zone)
                default:  remoteoffset =   0; break;
                }
                remoteoffset = remoteoffset * 3600;
-       }
+       } else
+               return -1;
 
        return remoteoffset;
 }
@@ -3156,12 +3684,19 @@ void get_rfc822_date(gchar *buf, gint len)
                   day, dd, mon, yyyy, hh, mm, ss, tzoffset(&t));
 }
 
+/* just a wrapper to suppress the warning of gcc about %c */
+size_t my_strftime(gchar *s, size_t max, const gchar *format,
+                  const struct tm *tm)
+{
+       return strftime(s, max, format, tm);
+}
+
 void debug_set_mode(gboolean mode)
 {
        debug_mode = mode;
 }
 
-gboolean debug_get_mode()
+gboolean debug_get_mode(void)
 {
        return debug_mode;
 }
@@ -3177,36 +3712,34 @@ void debug_print_real(const gchar *format, ...)
        g_vsnprintf(buf, sizeof(buf), format, args);
        va_end(args);
 
-       fputs(buf, stdout);
+       g_print("%s", buf);
+}
+
+
+const char * debug_srcname(const char *file)
+{
+        const char *s = strrchr (file, '/');
+        return s? s+1:file;
 }
 
+
 void * subject_table_lookup(GHashTable *subject_table, gchar * subject)
 {
        if (subject == NULL)
                subject = "";
-
-       if (g_strncasecmp(subject, "Re: ", 4) == 0)
-               return g_hash_table_lookup(subject_table, subject + 4);
        else
-               return g_hash_table_lookup(subject_table, subject);
+               subject += subject_get_prefix_length(subject);
+
+       return g_hash_table_lookup(subject_table, subject);
 }
 
 void subject_table_insert(GHashTable *subject_table, gchar * subject,
                          void * data)
 {
-       if (subject == NULL)
+       if (subject == NULL || *subject == 0)
                return;
-       if (* subject == 0)
-               return;
-       if (g_strcasecmp(subject, "Re:") == 0)
-               return;
-       if (g_strcasecmp(subject, "Re: ") == 0)
-               return;
-
-       if (g_strncasecmp(subject, "Re: ", 4) == 0)
-               g_hash_table_insert(subject_table, subject + 4, data);
-       else
-               g_hash_table_insert(subject_table, subject, data);
+       subject += subject_get_prefix_length(subject);
+       g_hash_table_insert(subject_table, subject, data);
 }
 
 void subject_table_remove(GHashTable *subject_table, gchar * subject)
@@ -3214,235 +3747,948 @@ void subject_table_remove(GHashTable *subject_table, gchar * subject)
        if (subject == NULL)
                return;
 
-       if (g_strncasecmp(subject, "Re: ", 4) == 0)
-               g_hash_table_remove(subject_table, subject + 4);
+       subject += subject_get_prefix_length(subject);
+       g_hash_table_remove(subject_table, subject);
+}
+
+/*!
+ *\brief       Check if a string is prefixed with known (combinations)
+ *             of prefixes. The function assumes that each prefix
+ *             is terminated by zero or exactly _one_ space.
+ *
+ *\param       str String to check for a prefixes
+ *
+ *\return      int Number of chars in the prefix that should be skipped
+ *             for a "clean" subject line. If no prefix was found, 0
+ *             is returned.
+ */
+int subject_get_prefix_length(const gchar *subject)
+{
+       /*!< Array with allowable reply prefixes regexps. */
+       static const gchar * const prefixes[] = {
+               "Re\\:",                        /* "Re:" */
+               "Re\\[[1-9][0-9]*\\]\\:",       /* "Re[XXX]:" (non-conforming news mail clients) */
+               "Antw\\:",                      /* "Antw:" (Dutch / German Outlook) */
+               "Aw\\:",                        /* "Aw:"   (German) */
+               "Antwort\\:",                   /* "Antwort:" (German Lotus Notes) */
+               "Res\\:",                       /* "Res:" (Brazilian Outlook) */
+               "Fw\\:",                        /* "Fw:" Forward */
+               "Enc\\:",                       /* "Enc:" Forward (Brazilian Outlook) */
+               "Odp\\:",                       /* "Odp:" Re (Polish Outlook) */
+               "Rif\\:"                        /* "Rif:" (Italian Outlook) */
+               /* add more */
+       };
+       const int PREFIXES = sizeof prefixes / sizeof prefixes[0];
+       int n;
+       regmatch_t pos;
+       static regex_t regex;
+       static gboolean init_;
+
+       if (!subject) return 0;
+       if (!*subject) return 0;
+
+       if (!init_) {
+               GString *s = g_string_new("");
+
+               for (n = 0; n < PREFIXES; n++)
+                       /* Terminate each prefix regexpression by a
+                        * "\ ?" (zero or ONE space), and OR them */
+                       g_string_append_printf(s, "(%s\\ ?)%s",
+                                         prefixes[n],
+                                         n < PREFIXES - 1 ?
+                                         "|" : "");
+
+               g_string_prepend(s, "(");
+               g_string_append(s, ")+");       /* match at least once */
+               g_string_prepend(s, "^\\ *");   /* from beginning of line */
+
+
+               /* We now have something like "^\ *((PREFIX1\ ?)|(PREFIX2\ ?))+"
+                * TODO: Should this be       "^\ *(((PREFIX1)|(PREFIX2))\ ?)+" ??? */
+               if (regcomp(&regex, s->str, REG_EXTENDED | REG_ICASE)) {
+                       debug_print("Error compiling regexp %s\n", s->str);
+                       g_string_free(s, TRUE);
+                       return 0;
+               } else {
+                       init_ = TRUE;
+                       g_string_free(s, TRUE);
+               }
+       }
+
+       if (!regexec(&regex, subject, 1, &pos, 0) && pos.rm_so != -1)
+               return pos.rm_eo;
        else
-               g_hash_table_remove(subject_table, subject);
+               return 0;
 }
 
-gboolean subject_is_reply(const gchar *subject)
+guint g_stricase_hash(gconstpointer gptr)
 {
-       /* XXX: just simply here so someone can handle really
-        * advanced Re: detection like "Re[4]", "ANTW:" or
-        * Re: Re: Re: Re: Re: Re: Re: Re:" stuff. */
-       if (subject == NULL) return FALSE;
-       else return 0 == g_strncasecmp(subject, "Re: ", 4);
+       guint hash_result = 0;
+       const char *str;
+
+       for (str = gptr; str && *str; str++) {
+               if (isupper((guchar)*str)) hash_result += (*str + ' ');
+               else hash_result += *str;
+       }
+
+       return hash_result;
 }
 
-FILE *get_tmpfile_in_dir(const gchar *dir, gchar **filename)
+gint g_stricase_equal(gconstpointer gptr1, gconstpointer gptr2)
 {
-       int fd;
-       
-       *filename = g_strdup_printf("%s%csylpheed.XXXXXX", dir, G_DIR_SEPARATOR);
-       fd = mkstemp(*filename);
+       const char *str1 = gptr1;
+       const char *str2 = gptr2;
 
-       return fdopen(fd, "w+");
+       return !g_utf8_collate(str1, str2);
 }
 
-/* allow Mutt-like patterns in quick search */
-gchar *expand_search_string(const gchar *search_string)
-{
-       int i = 0;
-       gchar term_char, save_char;
-       gchar *cmd_start, *cmd_end;
-       GString *matcherstr;
-       gchar *returnstr = NULL;
-       gchar *copy_str;
-       gboolean casesens, dontmatch;
-       /* list of allowed pattern abbreviations */
-       struct {
-               gchar           *abbreviated;   /* abbreviation */
-               gchar           *command;       /* actual matcher command */ 
-               gint            numparams;      /* number of params for cmd */
-               gboolean        qualifier;      /* do we append regexpcase */
-               gboolean        quotes;         /* do we need quotes */
-       }
-       cmds[] = {
-               { "a",  "all",                          0,      FALSE,  FALSE },
-               { "ag", "age_greater",                  1,      FALSE,  FALSE },
-               { "al", "age_lower",                    1,      FALSE,  FALSE },
-               { "b",  "body_part",                    1,      TRUE,   TRUE  },
-               { "B",  "message",                      1,      TRUE,   TRUE  },
-               { "c",  "cc",                           1,      TRUE,   TRUE  },
-               { "C",  "to_or_cc",                     1,      TRUE,   TRUE  },
-               { "D",  "deleted",                      0,      FALSE,  FALSE },
-               { "e",  "header \"Sender\"",            1,      TRUE,   TRUE  },
-               { "E",  "execute",                      1,      FALSE,  TRUE  },
-               { "f",  "from",                         1,      TRUE,   TRUE  },
-               { "F",  "forwarded",                    0,      FALSE,  FALSE },
-               { "h",  "headers_part",                 1,      TRUE,   TRUE  },
-               { "i",  "header \"Message-Id\"",        1,      TRUE,   TRUE  },
-               { "I",  "inreplyto",                    1,      TRUE,   TRUE  },
-               { "L",  "locked",                       0,      FALSE,  FALSE },
-               { "n",  "newsgroups",                   1,      TRUE,   TRUE  },
-               { "N",  "new",                          0,      FALSE,  FALSE },
-               { "O",  "~new",                         0,      FALSE,  FALSE },
-               { "r",  "replied",                      0,      FALSE,  FALSE },
-               { "R",  "~unread",                      0,      FALSE,  FALSE },
-               { "s",  "subject",                      1,      TRUE,   TRUE  },
-               { "se", "score_equal",                  1,      FALSE,  FALSE },
-               { "sg", "score_greater",                1,      FALSE,  FALSE },
-               { "sl", "score_lower",                  1,      FALSE,  FALSE },
-               { "Se", "size_equal",                   1,      FALSE,  FALSE },
-               { "Sg", "size_greater",                 1,      FALSE,  FALSE },
-               { "Ss", "size_smaller",                 1,      FALSE,  FALSE },
-               { "t",  "to",                           1,      TRUE,   TRUE  },
-               { "T",  "marked",                       0,      FALSE,  FALSE },
-               { "U",  "unread",                       0,      FALSE,  FALSE },
-               { "x",  "header \"References\"",        1,      TRUE,   TRUE  },
-               { "y",  "header \"X-Label\"",           1,      TRUE,   TRUE  },
-               { "&",  "&",                            0,      FALSE,  FALSE },
-               { "|",  "|",                            0,      FALSE,  FALSE },
-               { NULL, NULL,                           0,      FALSE,  FALSE }
-       };
+gint g_int_compare(gconstpointer a, gconstpointer b)
+{
+       return GPOINTER_TO_INT(a) - GPOINTER_TO_INT(b);
+}
+
+gchar *generate_msgid(gchar *buf, gint len)
+{
+       struct tm *lt;
+       time_t t;
+       gchar *addr;
+
+       t = time(NULL);
+       lt = localtime(&t);
+
+       addr = g_strconcat("@", get_domain_name(), NULL);
+
+       g_snprintf(buf, len, "%04d%02d%02d%02d%02d%02d.%08x%s",
+                  lt->tm_year + 1900, lt->tm_mon + 1,
+                  lt->tm_mday, lt->tm_hour,
+                  lt->tm_min, lt->tm_sec,
+                  (guint) rand(), addr);
+
+       g_free(addr);
+       return buf;
+}
+
+/*
+   quote_cmd_argument()
+
+   return a quoted string safely usable in argument of a command.
+
+   code is extracted and adapted from etPan! project -- DINH V. Hoà.
+*/
+
+gint quote_cmd_argument(gchar * result, guint size,
+                       const gchar * path)
+{
+       const gchar * p;
+       gchar * result_p;
+       guint remaining;
+
+       result_p = result;
+       remaining = size;
+
+       for(p = path ; * p != '\0' ; p ++) {
+
+               if (isalnum((guchar)*p) || (* p == '/')) {
+                       if (remaining > 0) {
+                               * result_p = * p;
+                               result_p ++;
+                               remaining --;
+                       }
+                       else {
+                               result[size - 1] = '\0';
+                               return -1;
+                       }
+               }
+               else {
+                       if (remaining >= 2) {
+                               * result_p = '\\';
+                               result_p ++;
+                               * result_p = * p;
+                               result_p ++;
+                               remaining -= 2;
+                       }
+                       else {
+                               result[size - 1] = '\0';
+                               return -1;
+                       }
+               }
+       }
+       if (remaining > 0) {
+               * result_p = '\0';
+       }
+       else {
+               result[size - 1] = '\0';
+               return -1;
+       }
+
+       return 0;
+}
+
+typedef struct
+{
+       GNode           *parent;
+       GNodeMapFunc     func;
+       gpointer         data;
+} GNodeMapData;
+
+static void g_node_map_recursive(GNode *node, gpointer data)
+{
+       GNodeMapData *mapdata = (GNodeMapData *) data;
+       GNode *newnode;
+       GNodeMapData newmapdata;
+       gpointer newdata;
+
+       newdata = mapdata->func(node->data, mapdata->data);
+       if (newdata != NULL) {
+               newnode = g_node_new(newdata);
+               g_node_append(mapdata->parent, newnode);
+
+               newmapdata.parent = newnode;
+               newmapdata.func = mapdata->func;
+               newmapdata.data = mapdata->data;
+
+               g_node_children_foreach(node, G_TRAVERSE_ALL, g_node_map_recursive, &newmapdata);
+       }
+}
+
+GNode *g_node_map(GNode *node, GNodeMapFunc func, gpointer data)
+{
+       GNode *root;
+       GNodeMapData mapdata;
+
+       g_return_val_if_fail(node != NULL, NULL);
+       g_return_val_if_fail(func != NULL, NULL);
+
+       root = g_node_new(func(node->data, data));
+
+       mapdata.parent = root;
+       mapdata.func = func;
+       mapdata.data = data;
+
+       g_node_children_foreach(node, G_TRAVERSE_ALL, g_node_map_recursive, &mapdata);
+
+       return root;
+}
+
+#define HEX_TO_INT(val, hex)                   \
+{                                              \
+       gchar c = hex;                          \
+                                               \
+       if ('0' <= c && c <= '9') {             \
+               val = c - '0';                  \
+       } else if ('a' <= c && c <= 'f') {      \
+               val = c - 'a' + 10;             \
+       } else if ('A' <= c && c <= 'F') {      \
+               val = c - 'A' + 10;             \
+       } else {                                \
+               val = -1;                       \
+       }                                       \
+}
+
+gboolean get_hex_value(guchar *out, gchar c1, gchar c2)
+{
+       gint hi, lo;
+
+       HEX_TO_INT(hi, c1);
+       HEX_TO_INT(lo, c2);
+
+       if (hi == -1 || lo == -1)
+               return FALSE;
+
+       *out = (hi << 4) + lo;
+       return TRUE;
+}
+
+#define INT_TO_HEX(hex, val)           \
+{                                      \
+       if ((val) < 10)                 \
+               hex = '0' + (val);      \
+       else                            \
+               hex = 'A' + (val) - 10; \
+}
+
+void get_hex_str(gchar *out, guchar ch)
+{
+       gchar hex;
+
+       INT_TO_HEX(hex, ch >> 4);
+       *out++ = hex;
+       INT_TO_HEX(hex, ch & 0x0f);
+       *out++ = hex;
+}
+
+#undef REF_DEBUG
+#ifndef REF_DEBUG
+#define G_PRINT_REF 1 == 1 ? (void) 0 : (void)
+#else
+#define G_PRINT_REF g_print
+#endif
+
+/*!
+ *\brief       Register ref counted pointer. It is based on GBoxed, so should
+ *             work with anything that uses the GType system. The semantics
+ *             are similar to a C++ auto pointer, with the exception that
+ *             C doesn't have automatic closure (calling destructors) when
+ *             exiting a block scope.
+ *             Use the \ref G_TYPE_AUTO_POINTER macro instead of calling this
+ *             function directly.
+ *
+ *\return      GType A GType type.
+ */
+GType g_auto_pointer_register(void)
+{
+       static GType auto_pointer_type;
+       if (!auto_pointer_type)
+               auto_pointer_type =
+                       g_boxed_type_register_static
+                               ("G_TYPE_AUTO_POINTER",
+                                (GBoxedCopyFunc) g_auto_pointer_copy,
+                                (GBoxedFreeFunc) g_auto_pointer_free);
+       return auto_pointer_type;
+}
+
+/*!
+ *\brief       Structure with g_new() allocated pointer guarded by the
+ *             auto pointer
+ */
+typedef struct AutoPointerRef {
+       void          (*free) (gpointer);
+       gpointer        pointer;
+       glong           cnt;
+} AutoPointerRef;
+
+/*!
+ *\brief       The auto pointer opaque structure that references the
+ *             pointer guard block.
+ */
+typedef struct AutoPointer {
+       AutoPointerRef *ref;
+       gpointer        ptr; /*!< access to protected pointer */
+} AutoPointer;
 
-       if (search_string == NULL)
+/*!
+ *\brief       Creates an auto pointer for a g_new()ed pointer. Example:
+ *
+ *\code
+ *
+ *             ... tell gtk_list_store it should use a G_TYPE_AUTO_POINTER
+ *             ... when assigning, copying and freeing storage elements
+ *
+ *             gtk_list_store_new(N_S_COLUMNS,
+ *                                G_TYPE_AUTO_POINTER,
+ *                                -1);
+ *
+ *
+ *             Template *precious_data = g_new0(Template, 1);
+ *             g_pointer protect = g_auto_pointer_new(precious_data);
+ *
+ *             gtk_list_store_set(container, &iter,
+ *                                S_DATA, protect,
+ *                                -1);
+ *
+ *             ... the gtk_list_store has copied the pointer and
+ *             ... incremented its reference count, we should free
+ *             ... the auto pointer (in C++ a destructor would do
+ *             ... this for us when leaving block scope)
+ *
+ *             g_auto_pointer_free(protect);
+ *
+ *             ... gtk_list_store_set() now manages the data. When
+ *             ... *explicitly* requesting a pointer from the list
+ *             ... store, don't forget you get a copy that should be
+ *             ... freed with g_auto_pointer_free() eventually.
+ *
+ *\endcode
+ *
+ *\param       pointer Pointer to be guarded.
+ *
+ *\return      GAuto * Pointer that should be used in containers with
+ *             GType support.
+ */
+GAuto *g_auto_pointer_new(gpointer p)
+{
+       AutoPointerRef *ref;
+       AutoPointer    *ptr;
+
+       if (p == NULL)
                return NULL;
 
-       copy_str = g_strdup(search_string);
-
-       /* if it's a full command don't process it so users
-          can still do something like from regexpcase "foo" */
-       for (i = 0; cmds[i].command; i++) {
-               const gchar *tmp_search_string = search_string;
-               cmd_start = cmds[i].command;
-               /* allow logical NOT */
-               if (*tmp_search_string == '~')
-                       tmp_search_string++;
-               if (!strncmp(tmp_search_string, cmd_start, strlen(cmd_start)))
+       ref = g_new0(AutoPointerRef, 1);
+       ptr = g_new0(AutoPointer, 1);
+
+       ref->pointer = p;
+       ref->free = g_free;
+       ref->cnt = 1;
+
+       ptr->ref = ref;
+       ptr->ptr = p;
+
+#ifdef REF_DEBUG
+       G_PRINT_REF ("XXXX ALLOC(%lx)\n", p);
+#endif
+       return ptr;
+}
+
+/*!
+ *\brief       Allocate an autopointer using the passed \a free function to
+ *             free the guarded pointer
+ */
+GAuto *g_auto_pointer_new_with_free(gpointer p, GFreeFunc free_)
+{
+       AutoPointer *aptr;
+
+       if (p == NULL)
+               return NULL;
+
+       aptr = g_auto_pointer_new(p);
+       aptr->ref->free = free_;
+       return aptr;
+}
+
+gpointer g_auto_pointer_get_ptr(GAuto *auto_ptr)
+{
+       if (auto_ptr == NULL)
+               return NULL;
+       return ((AutoPointer *) auto_ptr)->ptr;
+}
+
+/*!
+ *\brief       Copies an auto pointer by. It's mostly not necessary
+ *             to call this function directly, unless you copy/assign
+ *             the guarded pointer.
+ *
+ *\param       auto_ptr Auto pointer returned by previous call to
+ *             g_auto_pointer_new_XXX()
+ *
+ *\return      gpointer An auto pointer
+ */
+GAuto *g_auto_pointer_copy(GAuto *auto_ptr)
+{
+       AutoPointer     *ptr;
+       AutoPointerRef  *ref;
+       AutoPointer     *newp;
+
+       if (auto_ptr == NULL)
+               return NULL;
+
+       ptr = auto_ptr;
+       ref = ptr->ref;
+       newp = g_new0(AutoPointer, 1);
+
+       newp->ref = ref;
+       newp->ptr = ref->pointer;
+       ++(ref->cnt);
+
+#ifdef REF_DEBUG
+       G_PRINT_REF ("XXXX COPY(%lx) -- REF (%d)\n", ref->pointer, ref->cnt);
+#endif
+       return newp;
+}
+
+/*!
+ *\brief       Free an auto pointer
+ */
+void g_auto_pointer_free(GAuto *auto_ptr)
+{
+       AutoPointer     *ptr;
+       AutoPointerRef  *ref;
+
+       if (auto_ptr == NULL)
+               return;
+
+       ptr = auto_ptr;
+       ref = ptr->ref;
+
+       if (--(ref->cnt) == 0) {
+#ifdef REF_DEBUG
+               G_PRINT_REF ("XXXX FREE(%lx) -- REF (%d)\n", ref->pointer, ref->cnt);
+#endif
+               ref->free(ref->pointer);
+               g_free(ref);
+       }
+#ifdef REF_DEBUG
+       else
+               G_PRINT_REF ("XXXX DEREF(%lx) -- REF (%d)\n", ref->pointer, ref->cnt);
+#endif
+       g_free(ptr);
+}
+
+void replace_returns(gchar *str)
+{
+       if (!str)
+               return;
+
+       while (strstr(str, "\n")) {
+               *strstr(str, "\n") = ' ';
+       }
+       while (strstr(str, "\r")) {
+               *strstr(str, "\r") = ' ';
+       }
+}
+
+/* get_uri_part() - retrieves a URI starting from scanpos.
+                   Returns TRUE if succesful */
+gboolean get_uri_part(const gchar *start, const gchar *scanpos,
+                            const gchar **bp, const gchar **ep, gboolean hdr)
+{
+       const gchar *ep_;
+
+       g_return_val_if_fail(start != NULL, FALSE);
+       g_return_val_if_fail(scanpos != NULL, FALSE);
+       g_return_val_if_fail(bp != NULL, FALSE);
+       g_return_val_if_fail(ep != NULL, FALSE);
+
+       *bp = scanpos;
+
+       /* find end point of URI */
+       for (ep_ = scanpos; *ep_ != '\0'; ep_++) {
+               if (!g_ascii_isgraph(*(const guchar *)ep_) ||
+                   !IS_ASCII(*(const guchar *)ep_) ||
+                   strchr("[]{}()<>\"", *ep_))
                        break;
        }
-       if (cmds[i].command)
-               return copy_str;
 
-       matcherstr = g_string_sized_new(16);
-       cmd_start = cmd_end = copy_str;
-       while (cmd_end && *cmd_end) {
-               /* skip all white spaces */
-               while (*cmd_end && isspace(*cmd_end))
-                       cmd_end++;
+       /* no punctuation at end of string */
 
-               /* extract a command */
-               while (*cmd_end && !isspace(*cmd_end))
-                       cmd_end++;
+       /* FIXME: this stripping of trailing punctuations may bite with other URIs.
+        * should pass some URI type to this function and decide on that whether
+        * to perform punctuation stripping */
 
-               /* save character */
-               save_char = *cmd_end;
-               *cmd_end = '\0';
+#define IS_REAL_PUNCT(ch)      (g_ascii_ispunct(ch) && !strchr("/?=-", ch))
 
-               dontmatch = FALSE;
-               casesens = FALSE;
+       for (; ep_ - 1 > scanpos + 1 &&
+              IS_REAL_PUNCT(*(ep_ - 1));
+            ep_--)
+               ;
 
-               /* ~ and ! mean logical NOT */
-               if (*cmd_start == '~' || *cmd_start == '!')
-               {
-                       dontmatch = TRUE;
-                       cmd_start++;
-               }
-               /* % means case sensitive match */
-               if (*cmd_start == '%')
-               {
-                       casesens = TRUE;
-                       cmd_start++;
-               }
+#undef IS_REAL_PUNCT
 
-               /* find matching abbreviation */
-               for (i = 0; cmds[i].command; i++) {
-                       if (!strcmp(cmd_start, cmds[i].abbreviated)) {
-                               /* restore character */
-                               *cmd_end = save_char;
+       *ep = ep_;
 
-                               /* copy command */
-                               if (matcherstr->len > 0) {
-                                       g_string_append(matcherstr, " ");
-                               }
-                               if (dontmatch)
-                                       g_string_append(matcherstr, "~");
-                               g_string_append(matcherstr, cmds[i].command);
-                               g_string_append(matcherstr, " ");
+       return TRUE;
+}
 
-                               /* stop if no params required */
-                               if (cmds[i].numparams == 0)
-                                       break;
+gchar *make_uri_string(const gchar *bp, const gchar *ep)
+{
+       return g_strndup(bp, ep - bp);
+}
+
+/* valid mail address characters */
+#define IS_RFC822_CHAR(ch) \
+       (IS_ASCII(ch) && \
+        (ch) > 32   && \
+        (ch) != 127 && \
+        !g_ascii_isspace(ch) && \
+        !strchr("(),;<>\"", (ch)))
+
+/* alphabet and number within 7bit ASCII */
+#define IS_ASCII_ALNUM(ch)     (IS_ASCII(ch) && g_ascii_isalnum(ch))
+#define IS_QUOTE(ch) ((ch) == '\'' || (ch) == '"')
+
+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", "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);
 
-                               /* extract a parameter, allow quotes */
-                               cmd_end++;
-                               cmd_start = cmd_end;
-                               if (*cmd_start == '"') {
-                                       term_char = '"';
-                                       cmd_end++;
-                               }
-                               else
-                                       term_char = ' ';
+       g_return_val_if_fail(htab, NULL);
+       for (n = 0; n < sizeof toplvl_domains / sizeof toplvl_domains[0]; n++)
+               g_hash_table_insert(htab, (gpointer) toplvl_domains[n], (gpointer) toplvl_domains[n]);
+       return htab;
+}
 
-                               /* extract actual parameter */
-                               while ((*cmd_end) && (*cmd_end != term_char))
-                                       cmd_end++;
+static gboolean is_toplvl_domain(GHashTable *tab, const gchar *first, const gchar *last)
+{
+       const gint MAX_LVL_DOM_NAME_LEN = 6;
+       gchar buf[MAX_LVL_DOM_NAME_LEN + 1];
+       const gchar *m = buf + MAX_LVL_DOM_NAME_LEN + 1;
+       register gchar *p;
 
-                               if (*cmd_end && (*cmd_end != term_char))
-                                       break;
+       if (last - first > MAX_LVL_DOM_NAME_LEN || first > last)
+               return FALSE;
 
-                               if (*cmd_end == '"')
-                                       cmd_end++;
+       for (p = buf; p < m &&  first < last; *p++ = *first++)
+               ;
+       *p = 0;
+
+       return g_hash_table_lookup(tab, buf) != NULL;
+}
+
+/* get_email_part() - retrieves an email address. Returns TRUE if succesful */
+gboolean get_email_part(const gchar *start, const gchar *scanpos,
+                              const gchar **bp, const gchar **ep, gboolean hdr)
+{
+       /* more complex than the uri part because we need to scan back and forward starting from
+        * the scan position. */
+       gboolean result = FALSE;
+       const gchar *bp_ = NULL;
+       const gchar *ep_ = NULL;
+       static GHashTable *dom_tab;
+       const gchar *last_dot = NULL;
+       const gchar *prelast_dot = NULL;
+       const gchar *last_tld_char = NULL;
+
+       /* the informative part of the email address (describing the name
+        * of the email address owner) may contain quoted parts. the
+        * closure stack stores the last encountered quotes. */
+       gchar closure_stack[128];
+       gchar *ptr = closure_stack;
+
+       g_return_val_if_fail(start != NULL, FALSE);
+       g_return_val_if_fail(scanpos != NULL, FALSE);
+       g_return_val_if_fail(bp != NULL, FALSE);
+       g_return_val_if_fail(ep != NULL, FALSE);
+
+       if (hdr) {
+search_again:
+               /* go to the real start */
+               if (start[0] == ',')
+                       start++;
+               if (start[0] == ';')
+                       start++;
+               while (start[0] == ' ' || start[0] == '\t')
+                       start++;
+
+               *bp = start;
+
+               /* find end (either , or ; or end of line) */
+               if (strstr(start, ",") && strstr(start, ";"))
+                       *ep = strstr(start,",") < strstr(start, ";")
+                               ? strstr(start, ",") : strstr(start, ";");
+               else if (strstr(start, ","))
+                       *ep = strstr(start, ",");
+               else if (strstr(start, ";"))
+                       *ep = strstr(start, ";");
+               else
+                       *ep = start+strlen(start);
 
-                               save_char = *cmd_end;
-                               *cmd_end = '\0';
+               /* check there's still an @ in that, or search
+                * further if possible */
+               if (strstr(start, "@") && strstr(start, "@") < *ep)
+                       return TRUE;
+               else if (*ep < start+strlen(start)) {
+                       start = *ep;
+                       goto search_again;
+               } else
+                       return FALSE;
+       }
 
-                               if (cmds[i].qualifier) {
-                                       if (casesens)
-                                               g_string_append(matcherstr, "regexp ");
-                                       else
-                                               g_string_append(matcherstr, "regexpcase ");
-                               }
+       if (!dom_tab)
+               dom_tab = create_domain_tab();
+       g_return_val_if_fail(dom_tab, FALSE);
+
+       /* scan start of address */
+       for (bp_ = scanpos - 1;
+            bp_ >= start && IS_RFC822_CHAR(*(const guchar *)bp_); bp_--)
+               ;
 
-                               /* do we need to add quotes ? */
-                               if (cmds[i].quotes && term_char != '"')
-                                       g_string_append(matcherstr, "\"");
+       /* TODO: should start with an alnum? */
+       bp_++;
+       for (; bp_ < scanpos && !IS_ASCII_ALNUM(*(const guchar *)bp_); bp_++)
+               ;
 
-                               /* copy actual parameter */
-                               g_string_append(matcherstr, cmd_start);
+       if (bp_ != scanpos) {
+               /* scan end of address */
+               for (ep_ = scanpos + 1;
+                    *ep_ && IS_RFC822_CHAR(*(const guchar *)ep_); ep_++)
+                       if (*ep_ == '.') {
+                               prelast_dot = last_dot;
+                               last_dot = ep_;
+                               if (*(last_dot + 1) == '.') {
+                                       if (prelast_dot == NULL)
+                                               return FALSE;
+                                       last_dot = prelast_dot;
+                                       break;
+                               }
+                       }
 
-                               /* do we need to add quotes ? */
-                               if (cmds[i].quotes && term_char != '"')
-                                       g_string_append(matcherstr, "\"");
+               /* TODO: really should terminate with an alnum? */
+               for (; ep_ > scanpos && !IS_ASCII_ALNUM(*(const guchar *)ep_);
+                    --ep_)
+                       ;
+               ep_++;
 
-                               /* restore original character */
-                               *cmd_end = save_char;
+               if (last_dot == NULL)
+                       return FALSE;
+               if (last_dot >= ep_)
+                       last_dot = prelast_dot;
+               if (last_dot == NULL || (scanpos + 1 >= last_dot))
+                       return FALSE;
+               last_dot++;
 
+               for (last_tld_char = last_dot; last_tld_char < ep_; last_tld_char++)
+                       if (*last_tld_char == '?')
                                break;
-                       }
+
+               if (is_toplvl_domain(dom_tab, last_dot, last_tld_char))
+                       result = TRUE;
+
+               *ep = ep_;
+               *bp = bp_;
+       }
+
+       if (!result) return FALSE;
+
+       if (*ep_ && *(bp_ - 1) == '"' && *(ep_) == '"'
+       && *(ep_ + 1) == ' ' && *(ep_ + 2) == '<'
+       && IS_RFC822_CHAR(*(ep_ + 3))) {
+               /* this informative part with an @ in it is
+                * followed by the email address */
+               ep_ += 3;
+
+               /* go to matching '>' (or next non-rfc822 char, like \n) */
+               for (; *ep_ != '>' && *ep != '\0' && IS_RFC822_CHAR(*ep_); ep_++)
+                       ;
+
+               /* include the bracket */
+               if (*ep_ == '>') ep_++;
+
+               /* include the leading quote */
+               bp_--;
+
+               *ep = ep_;
+               *bp = bp_;
+               return TRUE;
+       }
+
+       /* skip if it's between quotes "'alfons@proteus.demon.nl'" <alfons@proteus.demon.nl> */
+       if (bp_ - 1 > start && IS_QUOTE(*(bp_ - 1)) && IS_QUOTE(*ep_))
+               return FALSE;
+
+       /* see if this is <bracketed>; in this case we also scan for the informative part. */
+       if (bp_ - 1 <= start || *(bp_ - 1) != '<' || *ep_ != '>')
+               return TRUE;
+
+#define FULL_STACK()   ((size_t) (ptr - closure_stack) >= sizeof closure_stack)
+#define IN_STACK()     (ptr > closure_stack)
+/* has underrun check */
+#define POP_STACK()    if(IN_STACK()) --ptr
+/* has overrun check */
+#define PUSH_STACK(c)  if(!FULL_STACK()) *ptr++ = (c); else return TRUE
+/* has underrun check */
+#define PEEK_STACK()   (IN_STACK() ? *(ptr - 1) : 0)
+
+       ep_++;
+
+       /* scan for the informative part. */
+       for (bp_ -= 2; bp_ >= start; bp_--) {
+               /* if closure on the stack keep scanning */
+               if (PEEK_STACK() == *bp_) {
+                       POP_STACK();
+                       continue;
+               }
+               if (*bp_ == '\'' || *bp_ == '"') {
+                       PUSH_STACK(*bp_);
+                       continue;
                }
 
-               if (*cmd_end) {
-                       cmd_end++;
-                       cmd_start = cmd_end;
+               /* if nothing in the closure stack, do the special conditions
+                * the following if..else expression simply checks whether
+                * a token is acceptable. if not acceptable, the clause
+                * should terminate the loop with a 'break' */
+               if (!PEEK_STACK()) {
+                       if (*bp_ == '-'
+                       && (((bp_ - 1) >= start) && isalnum(*(bp_ - 1)))
+                       && (((bp_ + 1) < ep_)    && isalnum(*(bp_ + 1)))) {
+                               /* hyphens are allowed, but only in
+                                  between alnums */
+                       } else if (strchr(" \"'", *bp_)) {
+                               /* but anything not being a punctiation
+                                  is ok */
+                       } else {
+                               break; /* anything else is rejected */
+                       }
                }
        }
 
-       g_free(copy_str);
-       returnstr = matcherstr->str;
-       g_string_free(matcherstr, FALSE);
-       return returnstr;
+       bp_++;
+
+       /* scan forward (should start with an alnum) */
+       for (; *bp_ != '<' && isspace(*bp_) && *bp_ != '"'; bp_++)
+               ;
+#undef PEEK_STACK
+#undef PUSH_STACK
+#undef POP_STACK
+#undef IN_STACK
+#undef FULL_STACK
+
+
+       *bp = bp_;
+       *ep = ep_;
+
+       return result;
 }
 
-guint g_stricase_hash(gconstpointer gptr)
+#undef IS_QUOTE
+#undef IS_ASCII_ALNUM
+#undef IS_RFC822_CHAR
+
+gchar *make_email_string(const gchar *bp, const gchar *ep)
 {
-       guint hash_result = 0;
-       const char *str;
+       /* returns a mailto: URI; mailto: is also used to detect the
+        * uri type later on in the button_pressed signal handler */
+       gchar *tmp;
+       gchar *result;
 
-       for (str = gptr; str && *str; str++) {
-               if (isupper(*str)) hash_result += (*str + ' ');
-               else hash_result += *str;
-       }
+       tmp = g_strndup(bp, ep - bp);
+       result = g_strconcat("mailto:", tmp, NULL);
+       g_free(tmp);
 
-       return hash_result;
+       return result;
 }
 
-gint g_stricase_equal(gconstpointer gptr1, gconstpointer gptr2)
+gchar *make_http_string(const gchar *bp, const gchar *ep)
 {
-       const char *str1 = gptr1;
-       const char *str2 = gptr2;
+       /* returns an http: URI; */
+       gchar *tmp;
+       gchar *result;
+
+       tmp = g_strndup(bp, ep - bp);
+       result = g_strconcat("http://", tmp, NULL);
+       g_free(tmp);
 
-       return !strcasecmp(str1, str2);
+       return result;
 }
 
+static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type)
+{
+       FILE *fp = fopen(path, "rb");
+       gchar buf[BUFFSIZE];
+       gchar *result = NULL;
+       if (!fp)
+               return NULL;
+       while (fgets(buf, sizeof (buf), fp) != NULL) {
+               gchar **parts = g_strsplit(buf, ";", -1);
+               gchar *trimmed = parts[0];
+               while (trimmed[0] == ' ')
+                       trimmed++;
+               while (trimmed[strlen(trimmed)-1] == ' ')
+                       trimmed[strlen(trimmed)-1] = '\0';
+
+               if (!strcmp(trimmed, type)) {
+                       trimmed = parts[1];
+                       while (trimmed[0] == ' ')
+                               trimmed++;
+                       while (trimmed[strlen(trimmed)-1] == ' ')
+                               trimmed[strlen(trimmed)-1] = '\0';
+                       while (trimmed[strlen(trimmed)-1] == '\n')
+                               trimmed[strlen(trimmed)-1] = '\0';
+                       while (trimmed[strlen(trimmed)-1] == '\r')
+                               trimmed[strlen(trimmed)-1] = '\0';
+                       result = g_strdup(trimmed);
+                       g_strfreev(parts);
+                       fclose(fp);
+                       if (strstr(result, "%s") && !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;
+                       }
+                       return result;
+               }
+               g_strfreev(parts);
+       }
+       fclose(fp);
+       return NULL;
+}
+gchar *mailcap_get_command_for_type(const gchar *type)
+{
+       gchar *result = NULL;
+       gchar *path = NULL;
+       path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".mailcap", NULL);
+       result = mailcap_get_command_in_file(path, type);
+       g_free(path);
+       if (result)
+               return result;
+       result = mailcap_get_command_in_file("/etc/mailcap", type);
+       return result;
+}
+
+gint copy_dir(const gchar *src, const gchar *dst)
+{
+       GDir *dir;
+       const gchar *name;
+
+       if ((dir = g_dir_open(src, 0, NULL)) == NULL) {
+               g_warning("failed to open directory: %s\n", src);
+               return -1;
+       }
+
+       if (make_dir(dst) < 0)
+               return -1;
+
+       while ((name = g_dir_read_name(dir)) != NULL) {
+               gchar *old_file, *new_file;
+               old_file = g_strconcat(src, G_DIR_SEPARATOR_S, name, NULL);
+               new_file = g_strconcat(dst, G_DIR_SEPARATOR_S, name, NULL);
+               debug_print("copying: %s -> %s\n", old_file, new_file);
+               if (g_file_test(old_file, G_FILE_TEST_IS_REGULAR)) {
+                       gint r = copy_file(old_file, new_file, TRUE);
+                       if (r < 0)
+                               return r;
+               } else if (g_file_test(old_file, G_FILE_TEST_IS_DIR)) {
+                       gint r = copy_dir(old_file, new_file);
+                       if (r < 0)
+                               return r;
+               }
+       }
+       return 0;
+}
+
+/* crude test to see if a file is an email. */
+gboolean file_is_email (const gchar *filename)
+{
+       FILE *fp = NULL;
+       gchar buffer[2048];
+       gint i = 0;
+       gint score = 0;
+       if (filename == NULL)
+               return FALSE;
+       if ((fp = g_fopen(filename, "rb")) == NULL)
+               return FALSE;
+       while (i < 60 && score < 3
+              && fgets(buffer, sizeof (buffer), fp) > 0) {
+               if (!strncmp(buffer, "From:", strlen("From:")))
+                       score++;
+               if (!strncmp(buffer, "To:", strlen("To:")))
+                       score++;
+               if (!strncmp(buffer, "Subject:", strlen("Subject:")))
+                       score++;
+               i++;
+       }
+       fclose(fp);
+       return (score >= 3);
+}