/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and 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
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#define _GNU_SOURCE
#include <stdio.h>
+#ifdef USE_PTHREAD
+#include <pthread.h>
+#endif
+
#include "defs.h"
#include <glib.h>
#include <glib/gi18n.h>
#include "alertpanel.h"
#include "statusbar.h"
-#define MSGBUFSIZE 8192
+#define MESSAGEBUFSIZE 8192
#ifdef HAVE_FGETS_UNLOCKED
#define SC_FGETS fgets_unlocked
g_warning("can't write to temporary file\n"); \
fclose(tmp_fp); \
fclose(mbox_fp); \
- g_unlink(tmp_file); \
+ claws_unlink(tmp_file); \
g_free(tmp_file); \
return -1; \
} \
/* 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;
gboolean printed = FALSE;
FolderItem *dropfolder;
- 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);
folder_item_update_freeze();
if (apply_filter)
- dropfolder = folder_get_default_processing();
+ dropfolder = folder_get_default_processing(account->account_id);
else
dropfolder = dest;
if (msgs > 0 && msgs%500 == 0) {
if (printed)
statusbar_pop_all();
- statusbar_print_all(_("Importing from mbox... (%d mails imported)"), msgs);
+ statusbar_print_all(
+ ngettext("Importing from mbox... (%d mail imported)",
+ "Importing from mbox... (%d mails imported)", msgs), msgs);
printed=TRUE;
GTK_EVENTS_FLUSH();
}
empty_lines = 0;
lines = 0;
- more = FALSE;
/* process all lines from mboxrc file */
while (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++;
g_warning("malformed mbox: %s: message %d is empty\n", mbox, msgs);
fclose(tmp_fp);
fclose(mbox_fp);
- g_unlink(tmp_file);
+ claws_unlink(tmp_file);
return -1;
}
FILE_OP_ERROR(tmp_file, "fclose");
g_warning("can't write to temporary file\n");
fclose(mbox_fp);
- g_unlink(tmp_file);
+ claws_unlink(tmp_file);
g_free(tmp_file);
return -1;
}
if (apply_filter) {
if ((msgnum = folder_item_add_msg(dropfolder, tmp_file, NULL, TRUE)) < 0) {
fclose(mbox_fp);
- g_unlink(tmp_file);
+ claws_unlink(tmp_file);
g_free(tmp_file);
return -1;
}
statusbar_pop_all();
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)) {
}
unfiltered = g_slist_reverse(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);
+ 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);
return -1;
}
- fprintf(lockfp, "%d\n", getpid());
- fclose(lockfp);
+ if (fprintf(lockfp, "%d\n", getpid()) < 0) {
+ FILE_OP_ERROR(lockfile, "fprintf");
+ g_free(lockfile);
+ fclose(lockfp);
+ return -1;
+ }
+
+ if (fclose(lockfp) == EOF) {
+ FILE_OP_ERROR(lockfile, "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);
+ claws_unlink(lockfile);
g_free(lockfile);
return -1;
}
retry++;
sleep(5);
}
- g_unlink(lockfile);
+ claws_unlink(lockfile);
g_free(lockfile);
} else if (type == LOCK_FLOCK) {
gint lockfd;
#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 && !defined(G_OS_WIN32)
if (fcntl(lockfd, F_SETLK, &fl) == -1) {
g_warning("can't fnctl %s (%s)", base, strerror(errno));
+ close(lockfd);
return -1;
} else {
fcntled = TRUE;
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;
if (fwrite(buf, 1, n_read, dest_fp) < n_read) {
g_warning("writing to %s failed.\n", dest);
fclose(dest_fp);
- g_unlink(dest);
+ claws_unlink(dest);
return -1;
}
}
}
if (err) {
- g_unlink(dest);
+ claws_unlink(dest);
return -1;
}
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"),
sizeof(buf));
extract_address(buf);
- fprintf(mbox_fp, "From %s %s",
- buf, ctime_r(&msginfo->date_t, buft));
+ if (fprintf(mbox_fp, "From %s %s",
+ buf, ctime_r(&msginfo->date_t, buft)) < 0) {
+ err = -1;
+#ifdef HAVE_FGETS_UNLOCKED
+ funlockfile(msg_fp);
+#endif
+ fclose(msg_fp);
+ goto out;
+ }
buf[0] = '\0';
while ((buf[offset] == '>')) {
offset++;
}
- if (!strncmp(buf+offset, "From ", 5))
- SC_FPUTC('>', mbox_fp);
- SC_FPUTS(buf, mbox_fp);
+ if (!strncmp(buf+offset, "From ", 5)) {
+ if (SC_FPUTC('>', mbox_fp) == EOF) {
+ err = -1;
+#ifdef HAVE_FGETS_UNLOCKED
+ funlockfile(msg_fp);
+#endif
+ fclose(msg_fp);
+ goto out;
+ }
+ }
+ if (SC_FPUTS(buf, mbox_fp) == EOF) {
+ err = -1;
+#ifdef HAVE_FGETS_UNLOCKED
+ funlockfile(msg_fp);
+#endif
+ 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'))
- SC_FPUTC('\n', mbox_fp);
+ if ((buf[len] != '\n') && (buf[len] != '\r')) {
+ if (SC_FPUTC('\n', mbox_fp) == EOF) {
+ err = -1;
+#ifdef HAVE_FGETS_UNLOCKED
+ funlockfile(msg_fp);
+#endif
+ fclose(msg_fp);
+ goto out;
+ }
+ }
}
/* add a trailing empty line */
- SC_FPUTC('\n', mbox_fp);
+ if (SC_FPUTC('\n', mbox_fp) == EOF) {
+ err = -1;
+#ifdef HAVE_FGETS_UNLOCKED
+ funlockfile(msg_fp);
+#endif
+ fclose(msg_fp);
+ goto out;
+ }
#ifdef HAVE_FGETS_UNLOCKED
funlockfile(msg_fp);
if (msgs%500 == 0)
GTK_EVENTS_FLUSH();
}
+
+out:
statusbar_progress_all(0,0,0);
statuswindow_pop_all();
#endif
fclose(mbox_fp);
- return 0;
+ return err;
}
/* read all messages in SRC, and store them into one MBOX file. */
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);
projects / claws.git / blobdiff