make the progress window more responsive when importing mbox file
[claws.git] / src / mbox.c
index 26cea303dcc19a6d10092234b7b78098a33a6705..faa63d55ca727068e33707e3a7d54cd867bedb3f 100644 (file)
@@ -1,10 +1,10 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto
  *
  * 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,
  * 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
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
-#include "defs.h"
 
+#include <stdio.h>
+
+#ifdef USE_PTHREAD
+#include <pthread.h>
+#endif
+
+#include "defs.h"
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
 #include <time.h>
 #include <errno.h>
 
+#ifdef G_OS_WIN32
+#  include <w32lib.h>
+#endif
+
 #include "mbox.h"
 #include "procmsg.h"
 #include "folder.h"
 #include "utils.h"
 #include "filtering.h"
 #include "alertpanel.h"
+#include "statusbar.h"
+#include "file-utils.h"
 
-#define MSGBUFSIZE     8192
+#define MESSAGEBUFSIZE 8192
 
 #define FPUTS_TO_TMP_ABORT_IF_FAIL(s) \
 { \
        lines++; \
-       if (fputs(s, tmp_fp) == EOF) { \
-               g_warning("can't write to temporary file\n"); \
-               fclose(tmp_fp); \
-               fclose(mbox_fp); \
-               g_unlink(tmp_file); \
+       if (claws_fputs(s, tmp_fp) == EOF) { \
+               g_warning("can't write to temporary file"); \
+               claws_fclose(tmp_fp); \
+               claws_fclose(mbox_fp); \
+               claws_unlink(tmp_file); \
                g_free(tmp_file); \
                return -1; \
        } \
 }
 
-gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter)
+gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter,
+              PrefsAccount *account)
 /* return values: -1 error, >=0 number of msgs added */
 {
        FILE *mbox_fp;
-       gchar buf[MSGBUFSIZE];
+       gchar buf[MESSAGEBUFSIZE];
        gchar *tmp_file;
        gint msgs = 0;
        gint lines;
        MsgInfo *msginfo;
        gboolean more;
-       GSList *to_filter = NULL, *cur;
+       GSList *to_filter = NULL, *filtered = NULL, *unfiltered = NULL, *cur, *to_add = NULL;
+       gboolean printed = FALSE;
+       FolderItem *dropfolder;
+       GStatBuf src_stat;
 
-       g_return_val_if_fail(dest != NULL, -1);
-       g_return_val_if_fail(mbox != NULL, -1);
+       cm_return_val_if_fail(dest != NULL, -1);
+       cm_return_val_if_fail(mbox != NULL, -1);
 
        debug_print("Getting messages from %s into %s...\n", mbox, dest->path);
 
-       if ((mbox_fp = g_fopen(mbox, "rb")) == NULL) {
-               FILE_OP_ERROR(mbox, "fopen");
+       if (g_stat(mbox, &src_stat) < 0) {
+               FILE_OP_ERROR(mbox, "g_stat");
+               alertpanel_error(_("Could not stat mbox file:\n%s\n"), mbox);
+               return -1;
+       }
+
+       if ((mbox_fp = claws_fopen(mbox, "rb")) == NULL) {
+               FILE_OP_ERROR(mbox, "claws_fopen");
                alertpanel_error(_("Could not open mbox file:\n%s\n"), mbox);
                return -1;
        }
 
        /* ignore empty lines on the head */
        do {
-               if (fgets(buf, sizeof(buf), mbox_fp) == NULL) {
-                       g_warning("can't read mbox file.\n");
-                       fclose(mbox_fp);
+               if (claws_fgets(buf, sizeof(buf), mbox_fp) == NULL) {
+                       g_warning("can't read mbox file.");
+                       claws_fclose(mbox_fp);
                        return -1;
                }
        } while (buf[0] == '\n' || buf[0] == '\r');
 
        if (strncmp(buf, "From ", 5) != 0) {
-               g_warning("invalid mbox format: %s\n", mbox);
-               fclose(mbox_fp);
+               g_warning("invalid mbox format: %s", mbox);
+               claws_fclose(mbox_fp);
                return -1;
        }
 
        tmp_file = get_tmp_file();
 
        folder_item_update_freeze();
+
+       if (apply_filter)
+               dropfolder = folder_get_default_processing(account->account_id);
+       else
+               dropfolder = dest;
        
        do {
                FILE *tmp_fp;
-               FolderItem *dropfolder;
                gint empty_lines;
                gint msgnum;
-
-               if ((tmp_fp = g_fopen(tmp_file, "wb")) == NULL) {
-                       FILE_OP_ERROR(tmp_file, "fopen");
-                       g_warning("can't open temporary file\n");
-                       fclose(mbox_fp);
+               
+               if (msgs%10 == 0) {
+                       long cur_offset_mb = ftell(mbox_fp) / (1024 * 1024);
+                       if (printed)
+                               statusbar_pop_all();
+                       statusbar_print_all(
+                                       ngettext("Importing from mbox... (%ld MB imported)",
+                                               "Importing from mbox... (%ld MB imported)", cur_offset_mb), cur_offset_mb);
+                       statusbar_progress_all(cur_offset_mb, src_stat.st_size / (1024*1024), 1);
+                       printed=TRUE;
+                       GTK_EVENTS_FLUSH();
+               }
+       
+               if ((tmp_fp = claws_fopen(tmp_file, "wb")) == NULL) {
+                       FILE_OP_ERROR(tmp_file, "claws_fopen");
+                       g_warning("can't open temporary file");
+                       claws_fclose(mbox_fp);
                        g_free(tmp_file);
                        return -1;
                }
@@ -120,15 +159,11 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter)
 
                empty_lines = 0;
                lines = 0;
-               more = FALSE;
 
                /* process all lines from mboxrc file */
-               while (fgets(buf, sizeof(buf), mbox_fp) != NULL) {
+               while (claws_fgets(buf, sizeof(buf), mbox_fp) != NULL) {
                        int offset;
 
-                       /* eof not reached, expect more lines */
-                       more = TRUE;
-
                        /* eat empty lines */
                        if (buf[0] == '\n' || buf[0] == '\r') {
                                empty_lines++;
@@ -138,7 +173,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter)
                        /* From separator or quoted From */
                        offset = 0;
                        /* detect leading '>' char(s) */
-                       while ((buf[offset] == '>')) {
+                       while (buf[offset] == '>') {
                                offset++;
                        }
                        if (!strncmp(buf+offset, "From ", 5)) {
@@ -182,56 +217,93 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter)
                }
 
                /* more emails to expect? */
-               more = !feof(mbox_fp);
+               more = !claws_feof(mbox_fp);
 
                /* warn if email part is empty (it's the minimum check 
                   we can do */
                if (lines == 0) {
-                       g_warning("malformed mbox: %s: message %d is empty\n", mbox, msgs);
-                       fclose(tmp_fp);
-                       fclose(mbox_fp);
-                       g_unlink(tmp_file);
+                       g_warning("malformed mbox: %s: message %d is empty", mbox, msgs);
+                       claws_fclose(tmp_fp);
+                       claws_fclose(mbox_fp);
+                       claws_unlink(tmp_file);
                        return -1;
                }
 
-               if (fclose(tmp_fp) == EOF) {
-                       FILE_OP_ERROR(tmp_file, "fclose");
-                       g_warning("can't write to temporary file\n");
-                       fclose(mbox_fp);
-                       g_unlink(tmp_file);
+               if (claws_safe_fclose(tmp_fp) == EOF) {
+                       FILE_OP_ERROR(tmp_file, "claws_fclose");
+                       g_warning("can't write to temporary file");
+                       claws_fclose(mbox_fp);
+                       claws_unlink(tmp_file);
                        g_free(tmp_file);
                        return -1;
                }
 
-               dropfolder = folder_get_default_processing();
+               if (apply_filter) {
+                       if ((msgnum = folder_item_add_msg(dropfolder, tmp_file, NULL, TRUE)) < 0) {
+                               claws_fclose(mbox_fp);
+                               claws_unlink(tmp_file);
+                               g_free(tmp_file);
+                               return -1;
+                       }
+                       msginfo = folder_item_get_msginfo(dropfolder, msgnum);
+                       to_filter = g_slist_prepend(to_filter, msginfo);
+               } else {
+                       MsgFileInfo *finfo = g_new0(MsgFileInfo, 1);
+                       finfo->file = tmp_file;
                        
-               if ((msgnum = folder_item_add_msg(dropfolder, tmp_file, NULL, TRUE)) < 0) {
-                       fclose(mbox_fp);
-                       g_unlink(tmp_file);
-                       g_free(tmp_file);
-                       return -1;
+                       to_add = g_slist_prepend(to_add, finfo);
+                       tmp_file = get_tmp_file();
+                       
+                       /* flush every 500 */
+                       if (msgs > 0 && msgs % 500 == 0) {
+                               folder_item_add_msgs(dropfolder, to_add, TRUE);
+                               procmsg_message_file_list_free(to_add);
+                               to_add = NULL;
+                       }
                }
-
-               msginfo = folder_item_get_msginfo(dropfolder, msgnum);
-                if (!apply_filter || !procmsg_msginfo_filter(msginfo)) {
-                       folder_item_move_msg(dest, msginfo);
-                       procmsg_msginfo_free(msginfo);
-               } else
-                       to_filter = g_slist_append(to_filter, msginfo);
-
                msgs++;
        } while (more);
 
-       filtering_move_and_copy_msgs(to_filter);
-       for (cur = to_filter; cur; cur = g_slist_next(cur)) {
-               MsgInfo *info = (MsgInfo *)cur->data;
-               procmsg_msginfo_free(info);
+       if (printed) {
+               statusbar_pop_all();
+               statusbar_progress_all(0, 0, 0);
+       }
+
+       if (apply_filter) {
+
+               folder_item_set_batch(dropfolder, FALSE);
+               procmsg_msglist_filter(to_filter, account, 
+                               &filtered, &unfiltered, TRUE);
+               folder_item_set_batch(dropfolder, TRUE);
+
+               filtering_move_and_copy_msgs(to_filter);
+               for (cur = filtered; cur; cur = g_slist_next(cur)) {
+                       MsgInfo *info = (MsgInfo *)cur->data;
+                       procmsg_msginfo_free(&info);
+               }
+
+               unfiltered = g_slist_reverse(unfiltered);
+               if (unfiltered) {
+                       folder_item_move_msgs(dest, unfiltered);
+                       for (cur = unfiltered; cur; cur = g_slist_next(cur)) {
+                               MsgInfo *info = (MsgInfo *)cur->data;
+                               procmsg_msginfo_free(&info);
+                       }
+               }
+
+               g_slist_free(unfiltered);
+               g_slist_free(filtered);
+               g_slist_free(to_filter);
+       } else if (to_add) {
+               folder_item_add_msgs(dropfolder, to_add, TRUE);
+               procmsg_message_file_list_free(to_add);
+               to_add = NULL;
        }
 
        folder_item_update_thaw();
        
        g_free(tmp_file);
-       fclose(mbox_fp);
+       claws_fclose(mbox_fp);
        debug_print("%d messages found.\n", msgs);
 
        return msgs;
@@ -248,38 +320,47 @@ gint lock_mbox(const gchar *base, LockType type)
                FILE *lockfp;
 
                lockfile = g_strdup_printf("%s.%d", base, getpid());
-               if ((lockfp = g_fopen(lockfile, "wb")) == NULL) {
-                       FILE_OP_ERROR(lockfile, "fopen");
-                       g_warning("can't create lock file %s\n", lockfile);
-                       g_warning("use 'flock' instead of 'file' if possible.\n");
+               if ((lockfp = claws_fopen(lockfile, "wb")) == NULL) {
+                       FILE_OP_ERROR(lockfile, "claws_fopen");
+                       g_warning("can't create lock file '%s', use 'flock' instead of 'file' if possible.", lockfile);
+                       g_free(lockfile);
+                       return -1;
+               }
+
+               if (fprintf(lockfp, "%d\n", getpid()) < 0) {
+                       FILE_OP_ERROR(lockfile, "fprintf");
                        g_free(lockfile);
+                       claws_fclose(lockfp);
                        return -1;
                }
 
-               fprintf(lockfp, "%d\n", getpid());
-               fclose(lockfp);
+               if (claws_safe_fclose(lockfp) == EOF) {
+                       FILE_OP_ERROR(lockfile, "claws_fclose");
+                       g_free(lockfile);
+                       return -1;
+               }
 
                locklink = g_strconcat(base, ".lock", NULL);
                while (link(lockfile, locklink) < 0) {
                        FILE_OP_ERROR(lockfile, "link");
                        if (retry >= 5) {
-                               g_warning("can't create %s\n", lockfile);
-                               g_unlink(lockfile);
+                               g_warning("can't create '%s'", lockfile);
+                               claws_unlink(lockfile);
                                g_free(lockfile);
                                return -1;
                        }
                        if (retry == 0)
                                g_warning("mailbox is owned by another"
-                                           " process, waiting...\n");
+                                         " process, waiting...");
                        retry++;
                        sleep(5);
                }
-               g_unlink(lockfile);
+               claws_unlink(lockfile);
                g_free(lockfile);
        } else if (type == LOCK_FLOCK) {
                gint lockfd;
                gboolean fcntled = FALSE;
-#if HAVE_FCNTL_H
+#if HAVE_FCNTL_H && !defined(G_OS_WIN32)
                struct flock fl;
                fl.l_type = F_WRLCK;
                fl.l_whence = SEEK_SET;
@@ -288,17 +369,18 @@ gint lock_mbox(const gchar *base, LockType type)
 #endif
 
 #if HAVE_FLOCK
-               if ((lockfd = open(base, O_RDWR)) < 0) {
+               if ((lockfd = g_open(base, O_RDWR, 0)) < 0) {
 #else
-               if ((lockfd = open(base, O_RDWR)) < 0) {
+               if ((lockfd = g_open(base, O_RDWR, 0)) < 0) {
 #endif
                        FILE_OP_ERROR(base, "open");
                        return -1;
                }
                
-#if HAVE_FCNTL_H
+#if HAVE_FCNTL_H && !defined(G_OS_WIN32)
                if (fcntl(lockfd, F_SETLK, &fl) == -1) {
-                       g_warning("can't fnctl %s (%s)", base, strerror(errno));
+                       g_warning("can't fnctl %s (%s)", base, g_strerror(errno));
+                       close(lockfd);
                        return -1;
                } else {
                        fcntled = TRUE;
@@ -316,14 +398,14 @@ gint lock_mbox(const gchar *base, LockType type)
                {
 #endif
 #endif /* HAVE_FLOCK */
-                       g_warning("can't lock %s\n", base);
+                       g_warning("can't lock %s", base);
                        if (close(lockfd) < 0)
                                perror("close");
                        return -1;
                }
                retval = lockfd;
        } else {
-               g_warning("invalid lock type\n");
+               g_warning("invalid lock type");
                return -1;
        }
 
@@ -339,7 +421,7 @@ gint unlock_mbox(const gchar *base, gint fd, LockType type)
                gchar *lockfile;
 
                lockfile = g_strconcat(base, ".lock", NULL);
-               if (g_unlink(lockfile) < 0) {
+               if (claws_unlink(lockfile) < 0) {
                        FILE_OP_ERROR(lockfile, "unlink");
                        g_free(lockfile);
                        return -1;
@@ -348,8 +430,8 @@ gint unlock_mbox(const gchar *base, gint fd, LockType type)
 
                return 0;
        } else if (type == LOCK_FLOCK) {
+#if HAVE_FCNTL_H && !defined(G_OS_WIN32)
                gboolean fcntled = FALSE;
-#if HAVE_FCNTL_H
                struct flock fl;
                fl.l_type = F_UNLCK;
                fl.l_whence = SEEK_SET;
@@ -358,7 +440,6 @@ gint unlock_mbox(const gchar *base, gint fd, LockType type)
 
                if (fcntl(fd, F_SETLK, &fl) == -1) {
                        g_warning("can't fnctl %s", base);
-                       return -1;
                } else {
                        fcntled = TRUE;
                }
@@ -374,7 +455,7 @@ gint unlock_mbox(const gchar *base, gint fd, LockType type)
                {
 #endif
 #endif /* HAVE_FLOCK */
-                       g_warning("can't unlock %s\n", base);
+                       g_warning("can't unlock %s", base);
                        if (close(fd) < 0)
                                perror("close");
                        return -1;
@@ -388,25 +469,70 @@ gint unlock_mbox(const gchar *base, gint fd, LockType type)
                return 0;
        }
 
-       g_warning("invalid lock type\n");
+       g_warning("invalid lock type");
        return -1;
 }
 
-gint copy_mbox(const gchar *src, const gchar *dest)
+gint copy_mbox(gint srcfd, const gchar *dest)
 {
-       return copy_file(src, dest, TRUE);
+       FILE *dest_fp;
+       ssize_t n_read;
+       gchar buf[BUFSIZ];
+       gboolean err = FALSE;
+       int save_errno = 0;
+
+       if (srcfd < 0) {
+               return -1;
+       }
+
+       if ((dest_fp = claws_fopen(dest, "wb")) == NULL) {
+               FILE_OP_ERROR(dest, "claws_fopen");
+               return -1;
+       }
+
+       if (change_file_mode_rw(dest_fp, dest) < 0) {
+               FILE_OP_ERROR(dest, "chmod");
+               g_warning("can't change file mode");
+       }
+
+       while ((n_read = read(srcfd, buf, sizeof(buf))) > 0) {
+               if (claws_fwrite(buf, 1, n_read, dest_fp) < n_read) {
+                       g_warning("writing to %s failed.", dest);
+                       claws_fclose(dest_fp);
+                       claws_unlink(dest);
+                       return -1;
+               }
+       }
+
+       if (save_errno != 0) {
+               g_warning("error %d reading mbox: %s", save_errno,
+                               g_strerror(save_errno));
+               err = TRUE;
+       }
+
+       if (claws_safe_fclose(dest_fp) == EOF) {
+               FILE_OP_ERROR(dest, "claws_fclose");
+               err = TRUE;
+       }
+
+       if (err) {
+               claws_unlink(dest);
+               return -1;
+       }
+
+       return 0;
 }
 
 void empty_mbox(const gchar *mbox)
 {
        FILE *fp;
 
-       if ((fp = g_fopen(mbox, "wb")) == NULL) {
-               FILE_OP_ERROR(mbox, "fopen");
-               g_warning("can't truncate mailbox to zero.\n");
+       if ((fp = claws_fopen(mbox, "wb")) == NULL) {
+               FILE_OP_ERROR(mbox, "claws_fopen");
+               g_warning("can't truncate mailbox to zero.");
                return;
        }
-       fclose(fp);
+       claws_safe_fclose(fp);
 }
 
 gint export_list_to_mbox(GSList *mlist, const gchar *mbox)
@@ -417,30 +543,33 @@ gint export_list_to_mbox(GSList *mlist, const gchar *mbox)
        FILE *msg_fp;
        FILE *mbox_fp;
        gchar buf[BUFFSIZE];
+       int err = 0;
 
+       gint msgs = 1, total = g_slist_length(mlist);
        if (g_file_test(mbox, G_FILE_TEST_EXISTS) == TRUE) {
                if (alertpanel_full(_("Overwrite mbox file"),
                                        _("This file already exists. Do you want to overwrite it?"),
-                                       GTK_STOCK_CANCEL, _("Overwrite"), NULL, FALSE,
-                                       NULL, ALERT_WARNING, G_ALERTDEFAULT)
+                                       GTK_STOCK_CANCEL, _("Overwrite"), NULL,
+                                       ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING)
                                != G_ALERTALTERNATE) {
                        return -2;
                }
        }
 
-       if ((mbox_fp = g_fopen(mbox, "wb")) == NULL) {
-               FILE_OP_ERROR(mbox, "fopen");
+       if ((mbox_fp = claws_fopen(mbox, "wb")) == NULL) {
+               FILE_OP_ERROR(mbox, "claws_fopen");
                alertpanel_error(_("Could not create mbox file:\n%s\n"), mbox);
                return -1;
        }
 
+       statusbar_print_all(_("Exporting to mbox..."));
        for (cur = mlist; cur != NULL; cur = cur->next) {
-               msginfo = (MsgInfo *)cur->data;
                int len;
+               gchar buft[BUFFSIZE];
+               msginfo = (MsgInfo *)cur->data;
 
-               msg_fp = procmsg_open_message(msginfo);
+               msg_fp = procmsg_open_message(msginfo, TRUE);
                if (!msg_fp) {
-                       procmsg_msginfo_free(msginfo);
                        continue;
                }
 
@@ -451,44 +580,72 @@ gint export_list_to_mbox(GSList *mlist, const gchar *mbox)
                         sizeof(buf));
                extract_address(buf);
 
-               fprintf(mbox_fp, "From %s %s",
-                       buf, ctime(&msginfo->date_t));
+               if (fprintf(mbox_fp, "From %s %s",
+                       buf, ctime_r(&msginfo->date_t, buft)) < 0) {
+                       err = -1;
+                       claws_fclose(msg_fp);
+                       goto out;
+               }
 
                buf[0] = '\0';
                
                /* write email to mboxrc */
-               while (fgets(buf, sizeof(buf), msg_fp) != NULL) {
+               while (claws_fgets(buf, sizeof(buf), msg_fp) != NULL) {
                        /* quote any From, >From, >>From, etc., according to mbox format specs */
                        int offset;
 
                        offset = 0;
                        /* detect leading '>' char(s) */
-                       while ((buf[offset] == '>')) {
+                       while (buf[offset] == '>') {
                                offset++;
                        }
-                       if (!strncmp(buf+offset, "From ", 5))
-                               fputc('>', mbox_fp);
-                       fputs(buf, mbox_fp);
+                       if (!strncmp(buf+offset, "From ", 5)) {
+                               if (claws_fputc('>', mbox_fp) == EOF) {
+                                       err = -1;
+                                       claws_fclose(msg_fp);
+                                       goto out;
+                               }
+                       }
+                       if (claws_fputs(buf, mbox_fp) == EOF) {
+                               err = -1;
+                               claws_fclose(msg_fp);
+                               goto out;
+                       }
                }
 
                /* force last line to end w/ a newline */
                len = strlen(buf);
                if (len > 0) {
                        len--;
-                       if ((buf[len] != '\n') && (buf[len] != '\r'))
-                               fputc('\n', mbox_fp);
+                       if ((buf[len] != '\n') && (buf[len] != '\r')) {
+                               if (claws_fputc('\n', mbox_fp) == EOF) {
+                                       err = -1;
+                                       claws_fclose(msg_fp);
+                                       goto out;
+                               }
+                       }
                }
 
                /* add a trailing empty line */
-               fputc('\n', mbox_fp);
+               if (claws_fputc('\n', mbox_fp) == EOF) {
+                       err = -1;
+                       claws_fclose(msg_fp);
+                       goto out;
+               }
 
-               fclose(msg_fp);
-               procmsg_msginfo_free(msginfo);
+               claws_safe_fclose(msg_fp);
+               statusbar_progress_all(msgs++,total, 500);
+               if (msgs%500 == 0)
+                       GTK_EVENTS_FLUSH();
        }
-       
-       fclose(mbox_fp);
 
-       return 0;
+out:
+       statusbar_progress_all(0,0,0);
+       statusbar_pop_all();
+
+       claws_safe_fclose(mbox_fp);
+
+       return err;
 }
 
 /* read all messages in SRC, and store them into one MBOX file. */
@@ -498,16 +655,18 @@ gint export_to_mbox(FolderItem *src, const gchar *mbox)
        GSList *mlist;
        gint ret;
        
-       g_return_val_if_fail(src != NULL, -1);
-       g_return_val_if_fail(src->folder != NULL, -1);
-       g_return_val_if_fail(mbox != NULL, -1);
+       cm_return_val_if_fail(src != NULL, -1);
+       cm_return_val_if_fail(src->folder != NULL, -1);
+       cm_return_val_if_fail(mbox != NULL, -1);
 
        debug_print("Exporting messages from %s into %s...\n",
                    src->path, mbox);
 
        mlist = folder_item_get_msg_list(src);
 
+       folder_item_update_freeze();
        ret = export_list_to_mbox(mlist, mbox);
+       folder_item_update_thaw();
 
        procmsg_msg_list_free(mlist);