2007-11-16 [wwp] 3.0.2cvs141
[claws.git] / src / common / utils.c
index 75ea7e4b0d1a4c1cdca4eb46b2319258b73cb4df..f49f1f1ca16cc79107dece355c63fae71b3913a3 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Claws Mail Team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -31,6 +31,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
+#include <sys/param.h>
 
 #if (HAVE_WCTYPE_H && HAVE_WCHAR_H)
 #  include <wchar.h>
 #  include <direct.h>
 #  include <io.h>
 #  include <fcntl.h>
+#  include <w32lib.h>
+#endif
+
+#ifdef MAEMO
+#include <libosso.h>
+#ifdef CHINOOK
+# include <tablet-browser-interface.h>
+#else
+# include <osso-browser-interface.h>
+#endif
 #endif
 
 #include "utils.h"
@@ -69,6 +80,18 @@ static gboolean debug_mode = FALSE;
 static GSList *tempfiles=NULL;
 #endif
 
+/* Return true if we are running as root.  This function should beused
+   instead of getuid () == 0.  */
+gboolean superuser_p (void)
+{
+#ifdef G_OS_WIN32
+  return w32_is_administrator ();
+#else
+  return !getuid();
+#endif  
+}
+
+
 
 #if !GLIB_CHECK_VERSION(2, 7, 0) && !defined(G_OS_UNIX)
 gint g_chdir(const gchar *path)
@@ -212,24 +235,6 @@ void slist_free_strings(GSList *list)
        }
 }
 
-GSList *slist_concat_unique (GSList *first, GSList *second)
-{
-       GSList *tmp, *ret;
-       if (first == NULL) {
-               if (second == NULL)
-                       return NULL;
-               else
-                       return second;
-       } else if (second == NULL)
-               return first;
-       ret = first;
-       for (tmp = second; tmp != NULL; tmp = g_slist_next(tmp)) {
-               if (g_slist_find(ret, tmp->data) == NULL)
-                       ret = g_slist_prepend(ret, tmp->data);
-       }
-       return ret;
-}
-
 static void hash_free_strings_func(gpointer key, gpointer value, gpointer data)
 {
        g_free(key);
@@ -240,17 +245,6 @@ void hash_free_strings(GHashTable *table)
        g_hash_table_foreach(table, hash_free_strings_func, NULL);
 }
 
-static void hash_free_value_mem_func(gpointer key, gpointer value,
-                                    gpointer data)
-{
-       g_free(value);
-}
-
-void hash_free_value_mem(GHashTable *table)
-{
-       g_hash_table_foreach(table, hash_free_value_mem_func, NULL);
-}
-
 gint str_case_equal(gconstpointer v, gconstpointer v2)
 {
        return g_ascii_strcasecmp((const gchar *)v, (const gchar *)v2) == 0;
@@ -293,16 +287,6 @@ gboolean str_case_find(const gchar *haystack, const gchar *needle)
        return strcasestr(haystack, needle) != NULL ? TRUE : FALSE;
 }
 
-gboolean str_find_equal(const gchar *haystack, const gchar *needle)
-{
-       return strcmp(haystack, needle) == 0;
-}
-
-gboolean str_case_find_equal(const gchar *haystack, const gchar *needle)
-{
-       return g_ascii_strcasecmp(haystack, needle) == 0;
-}
-
 gint to_number(const gchar *nstr)
 {
        register const gchar *p;
@@ -351,14 +335,14 @@ gchar *to_human_readable(off_t size)
                gb_format = _("%.2fGB");
        }
        
-       if (size < 1024) {
+       if (size < (off_t)1024) {
                g_snprintf(str, sizeof(str), b_format, (gint)size);
                return str;
-       } else if (size >> 10 < 1024) {
+       } else if (size >> 10 < (off_t)1024) {
                divide(size, 10, t, r);
                g_snprintf(str, sizeof(str), kb_format, t, r);
                return str;
-       } else if (size >> 20 < 1024) {
+       } else if (size >> 20 < (off_t)1024) {
                divide(size, 20, t, r);
                g_snprintf(str, sizeof(str), mb_format, t, r);
                return str;
@@ -464,7 +448,7 @@ gchar *strcrchomp(gchar *str)
        return str;
 }
 
-void file_strip_crs(const gchar *file)
+gint file_strip_crs(const gchar *file)
 {
        FILE *fp = NULL, *outfp = NULL;
        gchar buf[4096];
@@ -484,14 +468,27 @@ void file_strip_crs(const gchar *file)
 
        while (fgets(buf, sizeof (buf), fp) != NULL) {
                strcrchomp(buf);
-               fputs(buf, outfp);
+               if (fputs(buf, outfp) == EOF) {
+                       fclose(fp);
+                       fclose(outfp);
+                       goto unlinkout;
+               }
        }
 
        fclose(fp);
-       fclose(outfp);
-       rename_force(out, file);
+       if (fclose(outfp) == EOF) {
+               goto unlinkout;
+       }
+       
+       if (rename_force(out, file) < 0)
+               goto unlinkout;
+       
+       return 0;
+unlinkout:
+       g_unlink(out);
 freeout:
        g_free(out);
+       return -1;
 }
 
 /* Similar to `strstr' but this function ignores the case of both strings.  */
@@ -580,6 +577,30 @@ gint get_next_word_len(const gchar *s)
        return len;
 }
 
+static void trim_subject_for_compare(gchar *str)
+{
+       gchar *srcp;
+
+       eliminate_parenthesis(str, '[', ']');
+       eliminate_parenthesis(str, '(', ')');
+       g_strstrip(str);
+
+       srcp = str + subject_get_prefix_length(str);
+       if (srcp != str)
+               memmove(str, srcp, strlen(srcp) + 1);
+}
+
+static void trim_subject_for_sort(gchar *str)
+{
+       gchar *srcp;
+
+       g_strstrip(str);
+
+       srcp = str + subject_get_prefix_length(str);
+       if (srcp != str)
+               memmove(str, srcp, strlen(srcp) + 1);
+}
+
 /* compare subjects */
 gint subject_compare(const gchar *s1, const gchar *s2)
 {
@@ -614,30 +635,6 @@ gint subject_compare_for_sort(const gchar *s1, const gchar *s2)
        return g_utf8_collate(str1, str2);
 }
 
-void trim_subject_for_compare(gchar *str)
-{
-       gchar *srcp;
-
-       eliminate_parenthesis(str, '[', ']');
-       eliminate_parenthesis(str, '(', ')');
-       g_strstrip(str);
-
-       srcp = str + subject_get_prefix_length(str);
-       if (srcp != str)
-               memmove(str, srcp, strlen(srcp) + 1);
-}
-
-void trim_subject_for_sort(gchar *str)
-{
-       gchar *srcp;
-
-       g_strstrip(str);
-
-       srcp = str + subject_get_prefix_length(str);
-       if (srcp != str)
-               memmove(str, srcp, strlen(srcp) + 1);
-}
-
 void trim_subject(gchar *str)
 {
        register gchar *srcp;
@@ -725,7 +722,7 @@ void extract_parenthesis(gchar *str, gchar op, gchar cl)
        *destp = '\0';
 }
 
-void extract_parenthesis_with_skip_quote(gchar *str, gchar quote_chr,
+static void extract_parenthesis_with_skip_quote(gchar *str, gchar quote_chr,
                                         gchar op, gchar cl)
 {
        register gchar *srcp, *destp;
@@ -756,24 +753,6 @@ void extract_parenthesis_with_skip_quote(gchar *str, gchar quote_chr,
        *destp = '\0';
 }
 
-void eliminate_quote(gchar *str, gchar quote_chr)
-{
-       register gchar *srcp, *destp;
-
-       srcp = destp = str;
-
-       while ((destp = strchr(destp, quote_chr))) {
-               if ((srcp = strchr(destp + 1, quote_chr))) {
-                       srcp++;
-                       while (g_ascii_isspace(*srcp)) srcp++;
-                       memmove(destp, srcp, strlen(srcp) + 1);
-               } else {
-                       *destp = '\0';
-                       break;
-               }
-       }
-}
-
 void extract_quote(gchar *str, gchar quote_chr)
 {
        register gchar *p;
@@ -847,23 +826,6 @@ gchar *strchr_with_skip_quote(const gchar *str, gint quote_chr, gint c)
        return NULL;
 }
 
-gchar *strrchr_with_skip_quote(const gchar *str, gint quote_chr, gint c)
-{
-       gboolean in_quote = FALSE;
-       const gchar *p;
-
-       p = str + strlen(str) - 1;
-       while (p >= str) {
-               if (*p == c && !in_quote)
-                       return (gchar *)p;
-               if (*p == quote_chr)
-                       in_quote ^= TRUE;
-               p--;
-       }
-
-       return NULL;
-}
-
 void extract_address(gchar *str)
 {
        eliminate_address_comment(str);
@@ -1079,7 +1041,7 @@ void subst_char(gchar *str, gchar orig, gchar subst)
        }
 }
 
-void subst_chars(gchar *str, gchar *orig, gchar subst)
+static void subst_chars(gchar *str, gchar *orig, gchar subst)
 {
        register gchar *p = str;
 
@@ -1109,19 +1071,6 @@ void subst_for_shellsafe_filename(gchar *str)
        subst_chars(str, " \"'|&;()<>'!{}[]",'_');
 }
 
-gboolean is_header_line(const gchar *str)
-{
-       if (str[0] == ':') return FALSE;
-
-       while (*str != '\0' && *str != ' ') {
-               if (*str == ':')
-                       return TRUE;
-               str++;
-       }
-
-       return FALSE;
-}
-
 gboolean is_ascii_str(const gchar *str)
 {
        const guchar *p = (const guchar *)str;
@@ -1137,6 +1086,24 @@ gboolean is_ascii_str(const gchar *str)
        return TRUE;
 }
 
+static const gchar * line_has_quote_char_last(const gchar * str, const gchar *quote_chars)
+{
+       gchar * position = NULL;
+       gchar * tmp_pos = NULL;
+       int i;
+
+       if (quote_chars == NULL)
+               return FALSE;
+
+       for (i = 0; i < strlen(quote_chars); i++) {
+               tmp_pos = strrchr (str, quote_chars[i]);
+               if(position == NULL
+                  || (tmp_pos != NULL && position <= tmp_pos) )
+                       position = tmp_pos;
+       }
+       return position;
+}
+
 gint get_quote_level(const gchar *str, const gchar *quote_chars)
 {
        const gchar *first_pos;
@@ -1226,25 +1193,7 @@ const gchar * line_has_quote_char(const gchar * str, const gchar *quote_chars)
        return position;
 }
 
-const gchar * line_has_quote_char_last(const gchar * str, const gchar *quote_chars)
-{
-       gchar * position = NULL;
-       gchar * tmp_pos = NULL;
-       int i;
-
-       if (quote_chars == NULL)
-               return FALSE;
-
-       for (i = 0; i < strlen(quote_chars); i++) {
-               tmp_pos = strrchr (str, quote_chars[i]);
-               if(position == NULL
-                  || (tmp_pos != NULL && position <= tmp_pos) )
-                       position = tmp_pos;
-       }
-       return position;
-}
-
-gchar *strstr_with_skip_quote(const gchar *haystack, const gchar *needle)
+static gchar *strstr_with_skip_quote(const gchar *haystack, const gchar *needle)
 {
        register guint haystack_len, needle_len;
        gboolean in_squote = FALSE, in_dquote = FALSE;
@@ -1281,94 +1230,6 @@ gchar *strstr_with_skip_quote(const gchar *haystack, const gchar *needle)
        return NULL;
 }
 
-gchar *strchr_parenthesis_close(const gchar *str, gchar op, gchar cl)
-{
-       const gchar *p;
-       gchar quote_chr = '"';
-       gint in_brace;
-       gboolean in_quote = FALSE;
-
-       p = str;
-
-       if ((p = strchr_with_skip_quote(p, quote_chr, op))) {
-               p++;
-               in_brace = 1;
-               while (*p) {
-                       if (*p == op && !in_quote)
-                               in_brace++;
-                       else if (*p == cl && !in_quote)
-                               in_brace--;
-                       else if (*p == quote_chr)
-                               in_quote ^= TRUE;
-
-                       if (in_brace == 0)
-                               return (gchar *)p;
-
-                       p++;
-               }
-       }
-
-       return NULL;
-}
-
-gchar **strsplit_parenthesis(const gchar *str, gchar op, gchar cl,
-                            gint max_tokens)
-{
-       GSList *string_list = NULL, *slist;
-       gchar **str_array;
-       const gchar *s_op, *s_cl;
-       guint i, n = 1;
-
-       g_return_val_if_fail(str != NULL, NULL);
-
-       if (max_tokens < 1)
-               max_tokens = G_MAXINT;
-
-       s_op = strchr_with_skip_quote(str, '"', op);
-       if (!s_op) return NULL;
-       str = s_op;
-       s_cl = strchr_parenthesis_close(str, op, cl);
-       if (s_cl) {
-               do {
-                       guint len;
-                       gchar *new_string;
-
-                       str++;
-                       len = s_cl - str;
-                       new_string = g_new(gchar, len + 1);
-                       strncpy(new_string, str, len);
-                       new_string[len] = 0;
-                       string_list = g_slist_prepend(string_list, new_string);
-                       n++;
-                       str = s_cl + 1;
-
-                       while (*str && g_ascii_isspace(*str)) str++;
-                       if (*str != op) {
-                               string_list = g_slist_prepend(string_list,
-                                                             g_strdup(""));
-                               n++;
-                               s_op = strchr_with_skip_quote(str, '"', op);
-                               if (!--max_tokens || !s_op) break;
-                               str = s_op;
-                       } else
-                               s_op = str;
-                       s_cl = strchr_parenthesis_close(str, op, cl);
-               } while (--max_tokens && s_cl);
-       }
-
-       str_array = g_new(gchar*, n);
-
-       i = n - 1;
-
-       str_array[i--] = NULL;
-       for (slist = string_list; slist; slist = slist->next)
-               str_array[i--] = slist->data;
-
-       g_slist_free(string_list);
-
-       return str_array;
-}
-
 gchar **strsplit_with_quote(const gchar *str, const gchar *delim,
                            gint max_tokens)
 {
@@ -1611,7 +1472,7 @@ gint get_uri_len(const gchar *str)
 /* Decodes URL-Encoded strings (i.e. strings in which spaces are replaced by
  * plusses, and escape characters are used)
  */
-void decode_uri(gchar *decoded_uri, const gchar *encoded_uri)
+void decode_uri_with_plus(gchar *decoded_uri, const gchar *encoded_uri, gboolean with_plus)
 {
        gchar *dec = decoded_uri;
        const gchar *enc = encoded_uri;
@@ -1626,7 +1487,7 @@ void decode_uri(gchar *decoded_uri, const gchar *encoded_uri)
                                enc += 2;
                        }
                } else {
-                       if (*enc == '+')
+                       if (with_plus && *enc == '+')
                                *dec = ' ';
                        else
                                *dec = *enc;
@@ -1638,8 +1499,20 @@ void decode_uri(gchar *decoded_uri, const gchar *encoded_uri)
        *dec = '\0';
 }
 
+void decode_uri(gchar *decoded_uri, const gchar *encoded_uri)
+{
+       decode_uri_with_plus(decoded_uri, encoded_uri, TRUE);
+}
+
+static gchar *decode_uri_gdup(const gchar *encoded_uri)
+{
+    gchar *buffer = g_malloc(strlen(encoded_uri)+1);
+    decode_uri(buffer, encoded_uri);
+    return buffer;
+}
+
 gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
-                    gchar **subject, gchar **body, gchar **attach)
+                    gchar **subject, gchar **body, gchar ***attach)
 {
        gchar *tmp_mailto;
        gchar *p;
@@ -1647,6 +1520,8 @@ gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
                                          "/etc/passwd",
                                          "/etc/shadow",
                                          NULL };
+       gint num_attach = 0;
+       gchar **my_att = NULL;
 
        Xstrdup_a(tmp_mailto, mailto, return -1);
 
@@ -1660,7 +1535,10 @@ gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
        }
 
        if (to && !*to)
-               *to = g_strdup(tmp_mailto);
+               *to = decode_uri_gdup(tmp_mailto);
+
+       my_att = g_malloc(sizeof(char *));
+       my_att[0] = NULL;
 
        while (p) {
                gchar *field, *value;
@@ -1682,33 +1560,54 @@ gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
 
                if (*value == '\0') continue;
 
-               if (cc && !*cc && !g_ascii_strcasecmp(field, "cc")) {
-                       *cc = g_strdup(value);
-               } else if (bcc && !*bcc && !g_ascii_strcasecmp(field, "bcc")) {
-                       *bcc = g_strdup(value);
+               if (cc && !g_ascii_strcasecmp(field, "cc")) {
+                       if (!*cc) {
+                               *cc = decode_uri_gdup(value);
+                       } else {
+                               gchar *tmp = decode_uri_gdup(value);
+                               gchar *new_cc = g_strdup_printf("%s, %s", *cc, tmp);
+                               g_free(*cc);
+                               *cc = new_cc;
+                       }
+               } else if (bcc && !g_ascii_strcasecmp(field, "bcc")) {
+                       if (!*bcc) {
+                               *bcc = decode_uri_gdup(value);
+                       } else {
+                               gchar *tmp = decode_uri_gdup(value);
+                               gchar *new_bcc = g_strdup_printf("%s, %s", *bcc, tmp);
+                               g_free(*bcc);
+                               *bcc = new_bcc;
+                       }
                } else if (subject && !*subject &&
                           !g_ascii_strcasecmp(field, "subject")) {
-                       *subject = g_malloc(strlen(value) + 1);
-                       decode_uri(*subject, value);
+                       *subject = decode_uri_gdup(value);
                } else if (body && !*body && !g_ascii_strcasecmp(field, "body")) {
-                       *body = g_malloc(strlen(value) + 1);
-                       decode_uri(*body, value);
-               } else if (attach && !*attach && !g_ascii_strcasecmp(field, "attach")) {
+                       *body = decode_uri_gdup(value);
+               } else if (attach && !g_ascii_strcasecmp(field, "attach")) {
                        int i = 0;
-                       *attach = g_malloc(strlen(value) + 1);
-                       decode_uri(*attach, value);
+                       gchar *tmp = decode_uri_gdup(value);
                        for (; forbidden_uris[i]; i++) {
-                               if (strstr(*attach, forbidden_uris[i])) {
-                                       printf("Refusing to attach '%s', potential private data leak\n",
-                                                       *attach);
-                                       g_free(*attach);
-                                       *attach = NULL;
+                               if (strstr(tmp, forbidden_uris[i])) {
+                                       g_print("Refusing to attach '%s', potential private data leak\n",
+                                                       tmp);
+                                       g_free(tmp);
+                                       tmp = NULL;
                                        break;
                                }
                        }
+                       if (tmp) {
+                               /* attach is correct */
+                               num_attach++;
+                               printf("realloc my_att %d\n", (num_attach+1));
+                               my_att = g_realloc(my_att, (sizeof(char *))*(num_attach+1));
+                               my_att[num_attach-1] = tmp;
+                               my_att[num_attach] = NULL;
+                       }
                }
        }
 
+       if (attach)
+               *attach = my_att;
        return 0;
 }
 
@@ -1884,15 +1783,42 @@ const gchar *get_home_dir(void)
 #endif
 }
 
+static gchar *claws_rc_dir = NULL;
+static gboolean rc_dir_alt = FALSE;
 const gchar *get_rc_dir(void)
 {
-       static gchar *rc_dir = NULL;
 
-       if (!rc_dir)
-               rc_dir = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+       if (!claws_rc_dir)
+               claws_rc_dir = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
                                     RC_DIR, NULL);
 
-       return rc_dir;
+       return claws_rc_dir;
+}
+
+void set_rc_dir(const gchar *dir)
+{
+       if (claws_rc_dir != NULL) {
+               g_print("Error: rc_dir already set\n");
+       } else {
+               rc_dir_alt = TRUE;
+               if (g_path_is_absolute(dir))
+                       claws_rc_dir = g_strdup(dir);
+               else {
+                       claws_rc_dir = g_strconcat(g_get_current_dir(),
+                               G_DIR_SEPARATOR_S, dir, NULL);
+               }
+               debug_print("set rc_dir to %s\n", claws_rc_dir);
+               if (!is_dir_exist(claws_rc_dir)) {
+                       if (make_dir_hier(claws_rc_dir) != 0) {
+                               g_print("Error: can't create %s\n",
+                               claws_rc_dir);
+                       }
+               }
+       }
+}
+
+gboolean rc_dir_is_alt(void) {
+       return rc_dir_alt;
 }
 
 const gchar *get_mail_base_dir(void)
@@ -1910,39 +1836,81 @@ const gchar *get_mail_base_dir(void)
 #endif
 }
 
+#ifdef MAEMO
+const gchar *prefs_common_get_data_root(void);
+gchar *last_data_root = NULL;
+#endif
+
 const gchar *get_news_cache_dir(void)
 {
        static gchar *news_cache_dir = NULL;
-
+#ifdef MAEMO
+       const gchar *data_root = prefs_common_get_data_root();
+       if (strcmp2(data_root, last_data_root)) {
+               g_free(news_cache_dir);
+               news_cache_dir = NULL;
+       }
+#endif
        if (!news_cache_dir)
+#ifndef MAEMO
                news_cache_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
                                             NEWS_CACHE_DIR, NULL);
-
+#else
+       {
+               if (data_root) {
+                       news_cache_dir = g_strconcat(data_root, G_DIR_SEPARATOR_S,
+                                            "Claws", G_DIR_SEPARATOR_S, 
+                                            g_get_user_name(), G_DIR_SEPARATOR_S,
+                                            NEWS_CACHE_DIR, NULL);
+                       g_free(last_data_root);
+                       last_data_root = g_strdup(last_data_root);
+               } else {
+                       news_cache_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+                                            NEWS_CACHE_DIR, NULL);
+                       g_free(last_data_root);
+                       last_data_root = NULL;
+               }
+       }
+#endif
        return news_cache_dir;
 }
 
 const gchar *get_imap_cache_dir(void)
 {
        static gchar *imap_cache_dir = NULL;
+#ifdef MAEMO
+       const gchar *data_root = prefs_common_get_data_root();
+       if (strcmp2(data_root, last_data_root)) {
+               g_free(imap_cache_dir);
+               imap_cache_dir = NULL;
+       }
+#endif
 
        if (!imap_cache_dir)
+#ifndef MAEMO
                imap_cache_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
                                             IMAP_CACHE_DIR, NULL);
+#else
+       {
+               if (data_root) {
+                       imap_cache_dir = g_strconcat(data_root, G_DIR_SEPARATOR_S,
+                                            "Claws", G_DIR_SEPARATOR_S, 
+                                            g_get_user_name(), G_DIR_SEPARATOR_S,
+                                            IMAP_CACHE_DIR, NULL);
+                       g_free(last_data_root);
+                       last_data_root = g_strdup(last_data_root);
+               } else {
+                       imap_cache_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+                                            IMAP_CACHE_DIR, NULL);
+                       g_free(last_data_root);
+                       last_data_root = NULL;
+               }
+       }
+#endif
 
        return imap_cache_dir;
 }
 
-const gchar *get_mbox_cache_dir(void)
-{
-       static gchar *mbox_cache_dir = NULL;
-
-       if (!mbox_cache_dir)
-               mbox_cache_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
-                                            MBOX_CACHE_DIR, NULL);
-
-       return mbox_cache_dir;
-}
-
 const gchar *get_mime_tmp_dir(void)
 {
        static gchar *mime_tmp_dir = NULL;
@@ -1965,17 +1933,6 @@ const gchar *get_template_dir(void)
        return template_dir;
 }
 
-const gchar *get_header_cache_dir(void)
-{
-       static gchar *header_dir = NULL;
-
-       if (!header_dir)
-               header_dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
-                                        HEADER_CACHE_DIR, NULL);
-
-       return header_dir;
-}
-
 /* Return the default directory for Plugins. */
 const gchar *get_plugin_dir(void)
 {
@@ -2030,20 +1987,20 @@ const gchar *get_domain_name(void)
 
        if (!domain_name) {
                struct hostent *hp;
-               struct utsname uts;
+               char hostname[256];
 
-               if (uname(&uts) < 0) {
-                       perror("uname");
+               if (gethostname(hostname, sizeof(hostname)) != 0) {
+                       perror("gethostname");
                        domain_name = "unknown";
                } else {
-                       if ((hp = my_gethostbyname(uts.nodename)) == NULL) {
+                       hostname[sizeof(hostname) - 1] = '\0';
+                       if ((hp = my_gethostbyname(hostname)) == NULL) {
                                perror("gethostbyname");
-                               domain_name = g_strdup(uts.nodename);
+                               domain_name = g_strdup(hostname);
                        } else {
                                domain_name = g_strdup(hp->h_name);
                        }
                }
-
                debug_print("domain name = %s\n", domain_name);
        }
 
@@ -2103,33 +2060,6 @@ off_t get_file_size_as_crlf(const gchar *file)
        return size;
 }
 
-off_t get_left_file_size(FILE *fp)
-{
-       glong pos;
-       glong end;
-       off_t size;
-
-       if ((pos = ftell(fp)) < 0) {
-               perror("ftell");
-               return -1;
-       }
-       if (fseek(fp, 0L, SEEK_END) < 0) {
-               perror("fseek");
-               return -1;
-       }
-       if ((end = ftell(fp)) < 0) {
-               perror("fseek");
-               return -1;
-       }
-       size = end - pos;
-       if (fseek(fp, pos, SEEK_SET) < 0) {
-               perror("fseek");
-               return -1;
-       }
-
-       return size;
-}
-
 gboolean file_exist(const gchar *file, gboolean allow_fifo)
 {
        struct stat s;
@@ -2190,7 +2120,7 @@ gboolean is_file_entry_exist(const gchar *file)
 
 gboolean dirent_is_regular_file(struct dirent *d)
 {
-#ifdef HAVE_DIRENT_D_TYPE
+#if !defined(G_OS_WIN32) && !defined(MAEMO) && defined(HAVE_DIRENT_D_TYPE)
        if (d->d_type == DT_REG)
                return TRUE;
        else if (d->d_type != DT_UNKNOWN)
@@ -2200,18 +2130,6 @@ gboolean dirent_is_regular_file(struct dirent *d)
        return g_file_test(d->d_name, G_FILE_TEST_IS_REGULAR);
 }
 
-gboolean dirent_is_directory(struct dirent *d)
-{
-#ifdef HAVE_DIRENT_D_TYPE
-       if (d->d_type == DT_DIR)
-               return TRUE;
-       else if (d->d_type != DT_UNKNOWN)
-               return FALSE;
-#endif
-
-       return g_file_test(d->d_name, G_FILE_TEST_IS_DIR);
-}
-
 gint change_dir(const gchar *dir)
 {
        gchar *prevdir = NULL;
@@ -2406,62 +2324,6 @@ gint remove_all_numbered_files(const gchar *dir)
        return remove_numbered_files(dir, 0, UINT_MAX);
 }
 
-gint remove_expired_files(const gchar *dir, guint hours)
-{
-       GDir *dp;
-       const gchar *dir_name;
-       struct stat s;
-       gchar *prev_dir;
-       gint file_no;
-       time_t mtime, now, expire_time;
-
-       prev_dir = g_get_current_dir();
-
-       if (g_chdir(dir) < 0) {
-               FILE_OP_ERROR(dir, "chdir");
-               g_free(prev_dir);
-               return -1;
-       }
-
-       if ((dp = g_dir_open(".", 0, NULL)) == NULL) {
-               g_warning("failed to open directory: %s\n", dir);
-               g_free(prev_dir);
-               return -1;
-       }
-
-       now = time(NULL);
-       expire_time = hours * 60 * 60;
-
-       while ((dir_name = g_dir_read_name(dp)) != NULL) {
-               file_no = to_number(dir_name);
-               if (file_no > 0) {
-                       if (g_stat(dir_name, &s) < 0) {
-                               FILE_OP_ERROR(dir_name, "stat");
-                               continue;
-                       }
-                       if (S_ISDIR(s.st_mode))
-                               continue;
-                       mtime = MAX(s.st_mtime, s.st_atime);
-                       if (now - mtime > expire_time) {
-                               if (g_unlink(dir_name) < 0)
-                                       FILE_OP_ERROR(dir_name, "unlink");
-                       }
-               }
-       }
-
-       g_dir_close(dp);
-
-       if (g_chdir(prev_dir) < 0) {
-               FILE_OP_ERROR(prev_dir, "chdir");
-               g_free(prev_dir);
-               return -1;
-       }
-
-       g_free(prev_dir);
-
-       return 0;
-}
-
 gint remove_dir_recursive(const gchar *dir)
 {
        struct stat s;
@@ -2921,79 +2783,6 @@ gint canonicalize_file_replace(const gchar *file)
        return 0;
 }
 
-gint uncanonicalize_file(const gchar *src, const gchar *dest)
-{
-       FILE *src_fp, *dest_fp;
-       gchar buf[BUFFSIZE];
-       gboolean err = FALSE;
-
-       if ((src_fp = g_fopen(src, "rb")) == NULL) {
-               FILE_OP_ERROR(src, "fopen");
-               return -1;
-       }
-
-       if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
-               FILE_OP_ERROR(dest, "fopen");
-               fclose(src_fp);
-               return -1;
-       }
-
-       if (change_file_mode_rw(dest_fp, dest) < 0) {
-               FILE_OP_ERROR(dest, "chmod");
-               g_warning("can't change file mode\n");
-       }
-
-       while (fgets(buf, sizeof(buf), src_fp) != NULL) {
-               strcrchomp(buf);
-               if (fputs(buf, dest_fp) == EOF) {
-                       g_warning("writing to %s failed.\n", dest);
-                       fclose(dest_fp);
-                       fclose(src_fp);
-                       g_unlink(dest);
-                       return -1;
-               }
-       }
-
-       if (ferror(src_fp)) {
-               FILE_OP_ERROR(src, "fgets");
-               err = TRUE;
-       }
-       fclose(src_fp);
-       if (fclose(dest_fp) == EOF) {
-               FILE_OP_ERROR(dest, "fclose");
-               err = TRUE;
-       }
-
-       if (err) {
-               g_unlink(dest);
-               return -1;
-       }
-
-       return 0;
-}
-
-gint uncanonicalize_file_replace(const gchar *file)
-{
-       gchar *tmp_file;
-
-       tmp_file = get_tmp_file();
-
-       if (uncanonicalize_file(file, tmp_file) < 0) {
-               g_free(tmp_file);
-               return -1;
-       }
-
-       if (move_file(tmp_file, file, TRUE) < 0) {
-               g_warning("can't replace %s .\n", file);
-               g_unlink(tmp_file);
-               g_free(tmp_file);
-               return -1;
-       }
-
-       g_free(tmp_file);
-       return 0;
-}
-
 gchar *normalize_newlines(const gchar *str)
 {
        const gchar *p = str;
@@ -3090,7 +2879,7 @@ gchar *generate_mime_boundary(const gchar *prefix)
                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",
+       return g_strdup_printf("%s_/%s", prefix ? prefix : "MP",
                               buf_uniq);
 }
 
@@ -3162,12 +2951,12 @@ FILE *get_tmpfile_in_dir(const gchar *dir, gchar **filename)
 {
        int fd;
 #ifdef G_OS_WIN32
-       char *template = g_strdup_printf ("%s%csylpheed.XXXXXX",
+       char *template = g_strdup_printf ("%s%cclaws.XXXXXX",
                                          dir, G_DIR_SEPARATOR);
        fd = mkstemp_name(template, filename);
        g_free(template);
 #else
-       *filename = g_strdup_printf("%s%csylpheed.XXXXXX", dir, G_DIR_SEPARATOR);
+       *filename = g_strdup_printf("%s%cclaws.XXXXXX", dir, G_DIR_SEPARATOR);
        fd = mkstemp(*filename);
 #endif
        return fdopen(fd, "w+");
@@ -3294,7 +3083,39 @@ gchar *file_read_stream_to_str(FILE *fp)
        return str;
 }
 
-gint execute_async(gchar *const argv[])
+
+char *fgets_crlf(char *buf, int size, FILE *stream)
+{
+       gboolean is_cr = FALSE;
+       gboolean last_was_cr = FALSE;
+       int c = 0;
+       char *cs;
+
+       cs = buf;
+       while (--size > 0 && (c = getc(stream)) != EOF)
+       {
+               *cs++ = c;
+               is_cr = (c == '\r');
+               if (c == '\n') {
+                       break;
+               }
+               if (last_was_cr) {
+                       *(--cs) = '\n';
+                       cs++;
+                       ungetc(c, stream);
+                       break;
+               }
+               last_was_cr = is_cr;
+       }
+       if (c == EOF && cs == buf)
+               return NULL;
+
+       *cs = '\0';
+
+       return buf;     
+}
+
+static gint execute_async(gchar *const argv[])
 {
        g_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
 
@@ -3307,7 +3128,7 @@ gint execute_async(gchar *const argv[])
        return 0;
 }
 
-gint execute_sync(gchar *const argv[])
+static gint execute_sync(gchar *const argv[])
 {
        gint status;
 
@@ -3334,7 +3155,7 @@ gint execute_command_line(const gchar *cmdline, gboolean async)
        gchar **argv;
        gint ret;
 
-       debug_print("execute_command_line(): executing: %s\n", cmdline);
+       debug_print("execute_command_line(): executing: %s\n", cmdline?cmdline:"(null)");
 
        argv = strsplit_with_quote(cmdline, " ", 0);
 
@@ -3365,20 +3186,19 @@ gchar *get_command_output(const gchar *cmdline)
 
        return child_stdout;
 }
-
+#ifndef MAEMO
 static gint is_unchanged_uri_char(char c)
 {
        switch (c) {
                case '(':
                case ')':
-               case ',':
                        return 0;
                default:
                        return 1;
        }
 }
 
-void encode_uri(gchar *encoded_uri, gint bufsize, const gchar *uri)
+static void encode_uri(gchar *encoded_uri, gint bufsize, const gchar *uri)
 {
        int i;
        int k;
@@ -3402,13 +3222,13 @@ void encode_uri(gchar *encoded_uri, gint bufsize, const gchar *uri)
        }
        encoded_uri[k] = 0;
 }
-
+#endif
 gint open_uri(const gchar *uri, const gchar *cmdline)
 {
+#ifndef MAEMO
        gchar buf[BUFFSIZE];
        gchar *p;
        gchar encoded_uri[BUFFSIZE];
-
        g_return_val_if_fail(uri != NULL, -1);
 
        /* an option to choose whether to use encode_uri or not ? */
@@ -3427,7 +3247,12 @@ gint open_uri(const gchar *uri, const gchar *cmdline)
        }
 
        execute_command_line(buf, TRUE);
-
+#else
+       extern osso_context_t *get_osso_context(void);
+       osso_rpc_run_with_defaults(get_osso_context(), "osso_browser",
+                                       OSSO_BROWSER_OPEN_NEW_WINDOW_REQ, NULL, 
+                                       DBUS_TYPE_STRING, uri, DBUS_TYPE_INVALID);
+#endif
        return 0;
 }
 
@@ -3527,9 +3352,10 @@ time_t tzoffset_sec(time_t *now)
 {
        struct tm gmt, *lt;
        gint off;
-
-       gmt = *gmtime(now);
-       lt = localtime(now);
+       struct tm buf1, buf2;
+       
+       gmt = *gmtime_r(now, &buf1);
+       lt = localtime_r(now, &buf2);
 
        off = (lt->tm_hour - gmt.tm_hour) * 60 + lt->tm_min - gmt.tm_min;
 
@@ -3557,9 +3383,10 @@ gchar *tzoffset(time_t *now)
        struct tm gmt, *lt;
        gint off;
        gchar sign = '+';
+       struct tm buf1, buf2;
 
-       gmt = *gmtime(now);
-       lt = localtime(now);
+       gmt = *gmtime_r(now, &buf1);
+       lt = localtime_r(now, &buf2);
 
        off = (lt->tm_hour - gmt.tm_hour) * 60 + lt->tm_min - gmt.tm_min;
 
@@ -3591,23 +3418,19 @@ void get_rfc822_date(gchar *buf, gint len)
        time_t t;
        gchar day[4], mon[4];
        gint dd, hh, mm, ss, yyyy;
+       struct tm buf1;
+       gchar buf2[BUFFSIZE];
 
        t = time(NULL);
-       lt = localtime(&t);
+       lt = localtime_r(&t, &buf1);
 
-       sscanf(asctime(lt), "%3s %3s %d %d:%d:%d %d\n",
+       sscanf(asctime_r(lt, buf2), "%3s %3s %d %d:%d:%d %d\n",
               day, mon, &dd, &hh, &mm, &ss, &yyyy);
+
        g_snprintf(buf, len, "%s, %d %s %d %02d:%02d:%02d %s",
                   day, dd, mon, yyyy, hh, mm, ss, tzoffset(&t));
 }
 
-/* just a wrapper to suppress the warning of gcc about %c */
-size_t my_strftime(gchar *s, size_t max, const gchar *format,
-                  const struct tm *tm)
-{
-       return strftime(s, max, format, tm);
-}
-
 void debug_set_mode(gboolean mode)
 {
        debug_mode = mode;
@@ -3742,7 +3565,7 @@ int subject_get_prefix_length(const gchar *subject)
                return 0;
 }
 
-guint g_stricase_hash(gconstpointer gptr)
+static guint g_stricase_hash(gconstpointer gptr)
 {
        guint hash_result = 0;
        const char *str;
@@ -3754,7 +3577,7 @@ guint g_stricase_hash(gconstpointer gptr)
        return hash_result;
 }
 
-gint g_stricase_equal(gconstpointer gptr1, gconstpointer gptr2)
+static gint g_stricase_equal(gconstpointer gptr1, gconstpointer gptr2)
 {
        const char *str1 = gptr1;
        const char *str2 = gptr2;
@@ -3772,11 +3595,17 @@ gchar *generate_msgid(gchar *buf, gint len)
        struct tm *lt;
        time_t t;
        gchar *addr;
+       struct tm buft;
 
        t = time(NULL);
-       lt = localtime(&t);
+       lt = localtime_r(&t, &buft);
 
-       addr = g_strconcat("@", get_domain_name(), NULL);
+       if (strcmp(buf, "") == 0) {
+               addr = g_strconcat("@", get_domain_name(), NULL);
+       }
+       else {
+               addr = g_strconcat("@", buf, NULL);
+       }
 
        g_snprintf(buf, len, "%04d%02d%02d%02d%02d%02d.%08x%s",
                   lt->tm_year + 1900, lt->tm_mon + 1,
@@ -4416,7 +4245,7 @@ search_again:
 
        if (!result) return FALSE;
 
-       if (*ep_ && *(bp_ - 1) == '"' && *(ep_) == '"'
+       if (*ep_ && bp_ != start && *(bp_ - 1) == '"' && *(ep_) == '"'
        && *(ep_ + 1) == ' ' && *(ep_ + 2) == '<'
        && IS_RFC822_CHAR(*(ep_ + 3))) {
                /* this informative part with an @ in it is
@@ -4549,9 +4378,9 @@ static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type,
        while (fgets(buf, sizeof (buf), fp) != NULL) {
                gchar **parts = g_strsplit(buf, ";", 3);
                gchar *trimmed = parts[0];
-               while (trimmed[0] == ' ')
+               while (trimmed[0] == ' ' || trimmed[0] == '\t')
                        trimmed++;
-               while (trimmed[strlen(trimmed)-1] == ' ')
+               while (trimmed[strlen(trimmed)-1] == ' ' || trimmed[strlen(trimmed)-1] == '\t')
                        trimmed[strlen(trimmed)-1] = '\0';
 
                if (!strcmp(trimmed, type)) {
@@ -4564,13 +4393,13 @@ static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type,
                                gchar *testcmd = orig_testcmd;
                                if (strstr(testcmd,";"))
                                        *(strstr(testcmd,";")) = '\0';
-                               while (testcmd[0] == ' ')
+                               while (testcmd[0] == ' ' || testcmd[0] == '\t')
                                        testcmd++;
                                while (testcmd[strlen(testcmd)-1] == '\n')
                                        testcmd[strlen(testcmd)-1] = '\0';
                                while (testcmd[strlen(testcmd)-1] == '\r')
                                        testcmd[strlen(testcmd)-1] = '\0';
-                               while (testcmd[strlen(testcmd)-1] == ' ')
+                               while (testcmd[strlen(testcmd)-1] == ' ' || testcmd[strlen(testcmd)-1] == '\t')
                                        testcmd[strlen(testcmd)-1] = '\0';
                                        
                                if (strstr(testcmd, "%s")) {
@@ -4595,13 +4424,13 @@ static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type,
                        }
                        
                        trimmed = parts[1];
-                       while (trimmed[0] == ' ')
+                       while (trimmed[0] == ' ' || trimmed[0] == '\t')
                                trimmed++;
                        while (trimmed[strlen(trimmed)-1] == '\n')
                                trimmed[strlen(trimmed)-1] = '\0';
                        while (trimmed[strlen(trimmed)-1] == '\r')
                                trimmed[strlen(trimmed)-1] = '\0';
-                       while (trimmed[strlen(trimmed)-1] == ' ')
+                       while (trimmed[strlen(trimmed)-1] == ' ' || trimmed[strlen(trimmed)-1] == '\t')
                                trimmed[strlen(trimmed)-1] = '\0';
                        result = g_strdup(trimmed);
                        g_strfreev(parts);
@@ -4657,19 +4486,15 @@ void mailcap_update_default(const gchar *type, const gchar *command)
        FILE *fp = fopen(path, "rb");
        FILE *outfp = fopen(outpath, "wb");
        gchar buf[BUFFSIZE];
+       gboolean err = FALSE;
 
-       if (!fp) {
-               g_free(path);
-               g_free(outpath);
-               return;
-       }
        if (!outfp) {
                g_free(path);
                g_free(outpath);
                fclose(fp);
                return;
        }
-       while (fgets(buf, sizeof (buf), fp) != NULL) {
+       while (fp && fgets(buf, sizeof (buf), fp) != NULL) {
                gchar **parts = g_strsplit(buf, ";", 3);
                gchar *trimmed = parts[0];
                while (trimmed[0] == ' ')
@@ -4682,14 +4507,27 @@ void mailcap_update_default(const gchar *type, const gchar *command)
                        continue;
                }
                else {
-                       fputs(buf, outfp);
+                       if(fputs(buf, outfp) == EOF) {
+                               err = TRUE;
+                               break;
+                       }
                }
                g_strfreev(parts);
        }
-       fprintf(outfp, "%s; %s\n", type, command);
-       fclose(fp);
-       fclose(outfp);
-       g_rename(outpath, path);
+       if (fprintf(outfp, "%s; %s\n", type, command) < 0)
+               err = TRUE;
+
+       if (fp)
+               fclose(fp);
+
+       if (fclose(outfp) == EOF)
+               err = TRUE;
+               
+       if (!err)
+               g_rename(outpath, path);
+
+       g_free(path);
+       g_free(outpath);
 }
 
 gint copy_dir(const gchar *src, const gchar *dst)
@@ -4712,23 +4550,37 @@ gint copy_dir(const gchar *src, const gchar *dst)
                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)
+                       if (r < 0) {
+                               g_dir_close(dir);
                                return r;
-               } else if (g_file_test(old_file, G_FILE_TEST_IS_SYMLINK)) {
+                       }
+                }
+#ifndef G_OS_WIN32
+                /* Windows has no symlinks.  Or well, Vista seems to
+                   have something like this but the semantics might be
+                   different.  Thus we don't use it under Windows. */
+                else if (g_file_test(old_file, G_FILE_TEST_IS_SYMLINK)) {
                        GError *error;
                        gint r = 0;
                        gchar *target = g_file_read_link(old_file, &error);
                        if (target)
                                r = symlink(target, new_file);
                        g_free(target);
-                       if (r < 0)
+                       if (r < 0) {
+                               g_dir_close(dir);
                                return r;
-               } else if (g_file_test(old_file, G_FILE_TEST_IS_DIR)) {
+                       }
+                 }
+#endif /*G_OS_WIN32*/
+               else if (g_file_test(old_file, G_FILE_TEST_IS_DIR)) {
                        gint r = copy_dir(old_file, new_file);
-                       if (r < 0)
+                       if (r < 0) {
+                               g_dir_close(dir);
                                return r;
+                       }
                }
        }
+       g_dir_close(dir);
        return 0;
 }
 
@@ -4852,30 +4704,6 @@ static void init_time_names(void)
        time_am_pm = Q_("For use by strftime (default 12-hour time format)|%I:%M:%S %p");
 
        time_names_init_done = TRUE;
-#if 0
-       {
-       struct tm *lt;
-       time_t now = time(NULL), next;
-       gchar buf_a[1024], buf_b[1024];
-       
-       printf("test strftime:\n");
-       tzset();
-       for (next = now; next < now + 86400*365*2; next++) {
-               lt = localtime(&now);
-               strftime(buf_a, 1024, 
-                       "%a,%A,%b,%B,%c,%C,%d,%D,%e,%F,%G,%g,%h,%H,%I "
-                       "%j,%k,%l,%m,%M,%n,%p,%P,%r,%R,%s,%S,%t,%T,%u,%U,%V"
-                       "%w,%W,%x,%X,%y,%Y,%z,%Z,%%,%EY,%OY", lt);
-               fast_strftime(buf_b, 1024, 
-                       "%a,%A,%b,%B,%c,%C,%d,%D,%e,%F,%G,%g,%h,%H,%I "
-                       "%j,%k,%l,%m,%M,%n,%p,%P,%r,%R,%s,%S,%t,%T,%u,%U,%V"
-                       "%w,%W,%x,%X,%y,%Y,%z,%Z,%%,%EY,%OY", lt);
-               if (strcmp(buf_a, buf_b)) {
-                       printf("diff: \n%s\n%s\n", buf_a, buf_b);
-               }
-       }
-       }
-#endif
 }
 
 #define CHECK_SIZE() {                 \