/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2015 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
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#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
{ \
lines++; \
if (fputs(s, tmp_fp) == EOF) { \
- g_warning("can't write to temporary file\n"); \
+ g_warning("can't write to temporary file"); \
fclose(tmp_fp); \
fclose(mbox_fp); \
claws_unlink(tmp_file); \
/* 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);
/* ignore empty lines on the head */
do {
if (fgets(buf, sizeof(buf), mbox_fp) == NULL) {
- g_warning("can't read mbox file.\n");
+ g_warning("can't read mbox file.");
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);
+ g_warning("invalid mbox format: %s", mbox);
fclose(mbox_fp);
return -1;
}
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();
}
if ((tmp_fp = g_fopen(tmp_file, "wb")) == NULL) {
FILE_OP_ERROR(tmp_file, "fopen");
- g_warning("can't open temporary file\n");
+ g_warning("can't open temporary file");
fclose(mbox_fp);
g_free(tmp_file);
return -1;
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++;
/* 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);
+ g_warning("malformed mbox: %s: message %d is empty", mbox, msgs);
fclose(tmp_fp);
fclose(mbox_fp);
claws_unlink(tmp_file);
if (fclose(tmp_fp) == EOF) {
FILE_OP_ERROR(tmp_file, "fclose");
- g_warning("can't write to temporary file\n");
+ g_warning("can't write to temporary file");
fclose(mbox_fp);
claws_unlink(tmp_file);
g_free(tmp_file);
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);
+ procmsg_msginfo_free(&info);
}
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);
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");
+ 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);
+ fclose(lockfp);
return -1;
}
- if (fprintf(lockfp, "%d\n", getpid()) < 0 ||
- fclose(lockfp) == EOF) {
- FILE_OP_ERROR(lockfile, "fopen||fclose");
+ if (fclose(lockfp) == EOF) {
+ FILE_OP_ERROR(lockfile, "fclose");
g_free(lockfile);
return -1;
}
while (link(lockfile, locklink) < 0) {
FILE_OP_ERROR(lockfile, "link");
if (retry >= 5) {
- g_warning("can't create %s\n", 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);
}
#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));
+ g_warning("can't fnctl %s (%s)", base, g_strerror(errno));
+ close(lockfd);
return -1;
} else {
fcntled = TRUE;
{
#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;
}
{
#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;
return 0;
}
- g_warning("invalid lock type\n");
+ g_warning("invalid lock type");
return -1;
}
if (change_file_mode_rw(dest_fp, dest) < 0) {
FILE_OP_ERROR(dest, "chmod");
- g_warning("can't change file mode\n");
+ g_warning("can't change file mode");
}
while ((n_read = read(srcfd, buf, sizeof(buf))) > 0) {
break;
}
if (fwrite(buf, 1, n_read, dest_fp) < n_read) {
- g_warning("writing to %s failed.\n", dest);
+ g_warning("writing to %s failed.", dest);
fclose(dest_fp);
claws_unlink(dest);
return -1;
}
if (save_errno != 0) {
- g_warning("error %d reading mbox: %s\n", save_errno,
- strerror(save_errno));
+ g_warning("error %d reading mbox: %s", save_errno,
+ g_strerror(save_errno));
err = TRUE;
}
if ((fp = g_fopen(mbox, "wb")) == NULL) {
FILE_OP_ERROR(mbox, "fopen");
- g_warning("can't truncate mailbox to zero.\n");
+ g_warning("can't truncate mailbox to zero.");
return;
}
fclose(fp);
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