#include "mbox.h"
#include "procmsg.h"
#include "folder.h"
-#include "filter.h"
#include "prefs_common.h"
#include "prefs_account.h"
#include "account.h"
#define FPUTS_TO_TMP_ABORT_IF_FAIL(s) \
{ \
if (fputs(s, tmp_fp) == EOF) { \
- g_warning(_("can't write to temporary file\n")); \
+ g_warning("can't write to temporary file\n"); \
fclose(tmp_fp); \
fclose(mbox_fp); \
unlink(tmp_file); \
+ g_free(tmp_file); \
return -1; \
} \
}
-gint proc_mbox(FolderItem *dest, const gchar *mbox, GHashTable *folder_table)
+gint proc_mbox(FolderItem *dest, const gchar *mbox)
{
FILE *mbox_fp;
gchar buf[MSGBUFSIZE], from_line[MSGBUFSIZE];
gchar *tmp_file;
gint msgs = 0;
+ MsgInfo *msginfo;
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(mbox != NULL, -1);
- debug_print(_("Getting messages from %s into %s...\n"), mbox, dest->path);
+ debug_print("Getting messages from %s into %s...\n", mbox, dest->path);
- if ((mbox_fp = fopen(mbox, "r")) == NULL) {
+ if ((mbox_fp = fopen(mbox, "rb")) == NULL) {
FILE_OP_ERROR(mbox, "fopen");
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"));
+ g_warning("can't read mbox file.\n");
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\n", mbox);
fclose(mbox_fp);
return -1;
}
strcpy(from_line, buf);
if (fgets(buf, sizeof(buf), mbox_fp) == NULL) {
- g_warning(_("malformed mbox: %s\n"), mbox);
+ g_warning("malformed mbox: %s\n", mbox);
fclose(mbox_fp);
return -1;
}
tmp_file = get_tmp_file();
+ folder_item_update_freeze();
+
do {
FILE *tmp_fp;
FolderItem *dropfolder;
- gchar *startp, *endp, *rpath;
gint empty_line;
- gint val;
gboolean is_next_msg = FALSE;
gint msgnum;
- if ((tmp_fp = fopen(tmp_file, "w")) == NULL) {
+ if ((tmp_fp = 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\n");
fclose(mbox_fp);
+ g_free(tmp_file);
return -1;
}
if (change_file_mode_rw(tmp_fp, tmp_file) < 0)
FILE_OP_ERROR(tmp_file, "chmod");
/* convert unix From into Return-Path */
+ /*
startp = from_line + 5;
endp = strchr(startp, ' ');
if (endp == NULL)
g_snprintf(from_line, sizeof(from_line),
"Return-Path: %s\n", rpath);
g_free(rpath);
+ */
FPUTS_TO_TMP_ABORT_IF_FAIL(from_line);
FPUTS_TO_TMP_ABORT_IF_FAIL(buf);
is_next_msg = TRUE;
break;
} else {
- g_warning(_("unescaped From found:\n%s"),
+ g_warning("unescaped From found:\n%s",
from_line);
break;
}
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\n");
fclose(mbox_fp);
unlink(tmp_file);
+ g_free(tmp_file);
return -1;
}
- if (folder_table) {
- if (prefs_filtering == NULL) {
- /* old filtering */
- dropfolder = filter_get_dest_folder
- (prefs_common.fltlist, tmp_file);
- if (!dropfolder ||
- !strcmp(dropfolder->path, FILTER_NOT_RECEIVE))
- dropfolder = dest;
- val = GPOINTER_TO_INT(g_hash_table_lookup
- (folder_table, dropfolder));
- if (val == 0) {
- folder_item_scan(dropfolder);
- g_hash_table_insert(folder_table, dropfolder,
- GINT_TO_POINTER(1));
- }
- }
- else {
- /* new filtering */
- dropfolder = dest;
- }
- } else
- dropfolder = dest;
-
- if (msgnum = folder_item_add_msg(dropfolder, tmp_file, TRUE) < 0) {
+ dropfolder = folder_get_default_processing();
+
+ if ((msgnum = folder_item_add_msg(dropfolder, tmp_file, TRUE)) < 0) {
fclose(mbox_fp);
unlink(tmp_file);
+ g_free(tmp_file);
return -1;
}
-
- if (prefs_filtering != NULL) {
- /* new filtering */
- if (folder_table) {
- filter_message(prefs_filtering, dropfolder,
- msgnum, folder_table);
- }
- }
+
+ msginfo = folder_item_get_msginfo(dropfolder, msgnum);
+ if (!procmsg_msginfo_filter(msginfo))
+ folder_item_move_msg(dest, msginfo);
+ procmsg_msginfo_free(msginfo);
msgs++;
} while (from_line[0] != '\0');
+ folder_item_update_thaw();
+
+ g_free(tmp_file);
fclose(mbox_fp);
- debug_print(_("%d messages found.\n"), msgs);
+ debug_print("%d messages found.\n", msgs);
return msgs;
}
FILE *lockfp;
lockfile = g_strdup_printf("%s.%d", base, getpid());
- if ((lockfp = fopen(lockfile, "w")) == NULL) {
+ if ((lockfp = 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\n", lockfile);
+ g_warning("use 'flock' instead of 'file' if possible.\n");
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\n", lockfile);
unlink(lockfile);
g_free(lockfile);
return -1;
}
if (retry == 0)
- g_warning(_("mailbox is owned by another"
- " process, waiting...\n"));
+ g_warning("mailbox is owned by another"
+ " process, waiting...\n");
retry++;
sleep(5);
}
{
#endif
#endif /* HAVE_FLOCK */
- g_warning(_("can't lock %s\n"), base);
+ g_warning("can't lock %s\n", base);
if (close(lockfd) < 0)
perror("close");
return -1;
}
retval = lockfd;
} else {
- g_warning(_("invalid lock type\n"));
+ g_warning("invalid lock type\n");
return -1;
}
{
#endif
#endif /* HAVE_FLOCK */
- g_warning(_("can't unlock %s\n"), base);
+ g_warning("can't unlock %s\n", base);
if (close(fd) < 0)
perror("close");
return -1;
return 0;
}
- g_warning(_("invalid lock type\n"));
+ g_warning("invalid lock type\n");
return -1;
}
gint copy_mbox(const gchar *src, const gchar *dest)
{
- return copy_file(src, dest);
+ return copy_file(src, dest, TRUE);
}
void empty_mbox(const gchar *mbox)
FILE *fp;
FILE_OP_ERROR(mbox, "truncate");
- if ((fp = fopen(mbox, "w")) == NULL) {
+ if ((fp = 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.\n");
return;
}
fclose(fp);
g_return_val_if_fail(src->folder != NULL, -1);
g_return_val_if_fail(mbox != NULL, -1);
- debug_print(_("Exporting messages from %s into %s...\n"),
+ debug_print("Exporting messages from %s into %s...\n",
src->path, mbox);
- if ((mbox_fp = fopen(mbox, "w")) == NULL) {
+ if ((mbox_fp = fopen(mbox, "wb")) == NULL) {
FILE_OP_ERROR(mbox, "fopen");
return -1;
}
- mlist = src->folder->get_msg_list(src->folder, src, TRUE);
+ mlist = folder_item_get_msg_list(src);
for (cur = mlist; cur != NULL; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
projects / claws.git / blobdiff