Add a wrapper function to decode base64, returning a null-terminated string.

[claws.git] / src / common / utils.c

diff --git a/src/common/utils.c b/src/common/utils.c
index a592ce984b49fa1b43d5336ab584d18cc2c1a9fa..9c3d940828d12b473cc6fde8a9703e7b44a27820 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -95,7 +95,7 @@ gboolean superuser_p (void)
 
 
 
-#if !GLIB_CHECK_VERSION(2, 7, 0) && !defined(G_OS_UNIX)
+#if !defined(G_OS_UNIX)
 gint g_chdir(const gchar *path)
 {
 #ifdef G_OS_WIN32
@@ -208,7 +208,7 @@ int g_open(const gchar *filename, int flags, int mode)
        return open(filename, flags, mode);
 #endif
 }
-#endif /* GLIB_CHECK_VERSION && G_OS_UNIX */
+#endif /* G_OS_UNIX */
 
 
 #ifdef G_OS_WIN32
@@ -926,6 +926,7 @@ gchar *strchr_with_skip_quote(const gchar *str, gint quote_chr, gint c)
 
 void extract_address(gchar *str)
 {
+       cm_return_if_fail(str != NULL);
        eliminate_address_comment(str);
        if (strchr_with_skip_quote(str, '"', '<'))
                extract_parenthesis_with_skip_quote(str, '"', '<', '>');
@@ -2355,6 +2356,12 @@ gint remove_numbered_files(const gchar *dir, guint first, guint last)
        if (first == last) {
                /* Skip all the dir reading part. */
                gchar *filename = g_strdup_printf("%s%s%u", dir, G_DIR_SEPARATOR_S, first);
+               if (is_dir_exist(filename)) {
+                       /* a numbered directory with this name exists,
+                        * remove the dot-file instead */
+                       g_free(filename);
+                       filename = g_strdup_printf("%s%s.%u", dir, G_DIR_SEPARATOR_S, first);
+               }
                if (claws_unlink(filename) < 0) {
                        FILE_OP_ERROR(filename, "unlink");
                        g_free(filename);
@@ -2381,8 +2388,14 @@ gint remove_numbered_files(const gchar *dir, guint first, guint last)
        while ((dir_name = g_dir_read_name(dp)) != NULL) {
                file_no = to_number(dir_name);
                if (file_no > 0 && first <= file_no && file_no <= last) {
-                       if (is_dir_exist(dir_name))
+                       if (is_dir_exist(dir_name)) {
+                               gchar *dot_file = g_strdup_printf(".%s", dir_name);
+                               if (is_file_exist(dot_file) && claws_unlink(dot_file) < 0) {
+                                       FILE_OP_ERROR(dot_file, "unlink");
+                               }
+                               g_free(dot_file);
                                continue;
+                       }
                        if (claws_unlink(dir_name) < 0)
                                FILE_OP_ERROR(dir_name, "unlink");
                }
@@ -2439,6 +2452,14 @@ gint remove_numbered_files_not_in_list(const gchar *dir, GSList *numberlist)
                        continue;
                if (file_no > 0 && g_hash_table_lookup(wanted_files, GINT_TO_POINTER(file_no)) == NULL) {
                        debug_print("removing unwanted file %d from %s\n", file_no, dir);
+                       if (is_dir_exist(dir_name)) {
+                               gchar *dot_file = g_strdup_printf(".%s", dir_name);
+                               if (is_file_exist(dot_file) && claws_unlink(dot_file) < 0) {
+                                       FILE_OP_ERROR(dot_file, "unlink");
+                               }
+                               g_free(dot_file);
+                               continue;
+                       }
                        if (claws_unlink(dir_name) < 0)
                                FILE_OP_ERROR(dir_name, "unlink");
                }
@@ -3102,6 +3123,8 @@ FILE *get_tmpfile_in_dir(const gchar *dir, gchar **filename)
 #else
        *filename = g_strdup_printf("%s%cclaws.XXXXXX", dir, G_DIR_SEPARATOR);
        fd = mkstemp(*filename);
+       if (fd < 0)
+               return NULL;
 #endif
        return fdopen(fd, "w+");
 }
@@ -4777,11 +4800,30 @@ void mailcap_update_default(const gchar *type, const gchar *command)
        path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".mailcap", NULL);
        outpath = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".mailcap.new", NULL);
        FILE *fp = g_fopen(path, "rb");
-       FILE *outfp = g_fopen(outpath, "wb");
+       FILE *outfp = NULL;
        gchar buf[BUFFSIZE];
        gboolean err = FALSE;
 
+       if (!fp) {
+               fp = g_fopen(path, "a");
+               if (!fp) {
+                       g_warning("failed to create file %s\n", path);
+                       g_free(path);
+                       g_free(outpath);
+                       return;
+               }
+               fp = g_freopen(path, "rb", fp);
+               if (!fp) {
+                       g_warning("failed to reopen file %s\n", path);
+                       g_free(path);
+                       g_free(outpath);
+                       return;
+               }
+       }
+
+       outfp = g_fopen(outpath, "wb");
        if (!outfp) {
+               g_warning("failed to create file %s\n", outpath);
                g_free(path);
                g_free(outpath);
                fclose(fp);
@@ -5262,8 +5304,7 @@ size_t fast_strftime(gchar *buf, gint buflen, const gchar *format, struct tm *lt
                                format++;
                                break;
                        default:
-                               if (format && *format)
-                                       g_warning("format error (%c)", *format);
+                               g_warning("format error (%c)", *format);
                                *curpos = '\0';
                                return total_done;
                        }
@@ -5509,6 +5550,17 @@ int cm_canonicalize_filename(const gchar *filename, gchar **canonical_name) {
        return 0;
 }
 
+/* Returns a decoded base64 string, guaranteed to be null-terminated. */
+guchar *g_base64_decode_zero(const gchar *text, gsize *out_len)
+{
+       gchar *tmp = g_base64_decode(text, out_len);
+       gchar *out = g_strndup(tmp, *out_len);
+
+       g_free(tmp);
+
+       return out;
+}
+
 #if !GLIB_CHECK_VERSION(2, 30, 0)
 /**
  * g_utf8_substring: