/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include <sys/file.h>
#include <ctype.h>
#include <time.h>
+#include <errno.h>
#include "mbox.h"
#include "procmsg.h"
#include "account.h"
#include "utils.h"
#include "filtering.h"
+#include "alertpanel.h"
#define MSGBUFSIZE 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); \
- unlink(tmp_file); \
+ g_unlink(tmp_file); \
g_free(tmp_file); \
return -1; \
} \
}
gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter)
+/* return values: -1 error, >=0 number of msgs added */
{
FILE *mbox_fp;
- gchar buf[MSGBUFSIZE], from_line[MSGBUFSIZE];
+ gchar buf[MSGBUFSIZE];
gchar *tmp_file;
gint msgs = 0;
+ gint lines;
MsgInfo *msginfo;
+ gboolean more;
+ GSList *to_filter = NULL, *cur;
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);
- if ((mbox_fp = fopen(mbox, "rb")) == NULL) {
+ if ((mbox_fp = g_fopen(mbox, "rb")) == NULL) {
FILE_OP_ERROR(mbox, "fopen");
+ alertpanel_error(_("Could not open mbox file:\n%s\n"), mbox);
return -1;
}
return -1;
}
- strcpy(from_line, buf);
- if (fgets(buf, sizeof(buf), mbox_fp) == NULL) {
- 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;
- gint empty_line;
- gboolean is_next_msg = FALSE;
+ gint empty_lines;
gint msgnum;
- if ((tmp_fp = fopen(tmp_file, "wb")) == NULL) {
+ 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);
g_free(tmp_file);
return -1;
}
- if (change_file_mode_rw(tmp_fp, tmp_file) < 0)
+ 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)
- rpath = g_strdup(startp);
- else
- rpath = g_strndup(startp, endp - startp);
- g_strstrip(rpath);
- 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);
- from_line[0] = '\0';
-
- empty_line = 0;
+ 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_line++;
- buf[0] = '\0';
+ empty_lines++;
continue;
}
- /* From separator */
- while (!strncmp(buf, "From ", 5)) {
- strcpy(from_line, buf);
- if (fgets(buf, sizeof(buf), mbox_fp) == NULL) {
- buf[0] = '\0';
+ /* From separator or quoted From */
+ offset = 0;
+ /* detect leading '>' char(s) */
+ while ((buf[offset] == '>')) {
+ offset++;
+ }
+ if (!strncmp(buf+offset, "From ", 5)) {
+ /* From separator: */
+ if (offset == 0) {
+ /* expect next mbox item */
break;
}
- if (is_header_line(buf)) {
- is_next_msg = TRUE;
- break;
- } else if (!strncmp(buf, "From ", 5)) {
- continue;
- } else if (!strncmp(buf, ">From ", 6)) {
- g_memmove(buf, buf + 1, strlen(buf));
- is_next_msg = TRUE;
- break;
- } else {
- g_warning("unescaped From found:\n%s",
- from_line);
- break;
+ /* quoted From: */
+ /* flush any eaten empty line */
+ if (empty_lines > 0) {
+ while (empty_lines-- > 0) {
+ FPUTS_TO_TMP_ABORT_IF_FAIL("\n");
+ }
+ empty_lines = 0;
}
+ /* store the unquoted line */
+ FPUTS_TO_TMP_ABORT_IF_FAIL(buf + 1);
+ continue;
}
- if (is_next_msg) break;
- if (empty_line > 0) {
- while (empty_line--)
+ /* other line */
+ /* flush any eaten empty line */
+ if (empty_lines > 0) {
+ while (empty_lines-- > 0) {
FPUTS_TO_TMP_ABORT_IF_FAIL("\n");
- empty_line = 0;
}
-
- if (from_line[0] != '\0') {
- FPUTS_TO_TMP_ABORT_IF_FAIL(from_line);
- from_line[0] = '\0';
+ empty_lines = 0;
}
-
- if (buf[0] != '\0') {
- if (!strncmp(buf, ">From ", 6)) {
- FPUTS_TO_TMP_ABORT_IF_FAIL(buf + 1);
- } else
+ /* store the line itself */
FPUTS_TO_TMP_ABORT_IF_FAIL(buf);
+ }
+ /* end of mbox item or end of mbox */
- buf[0] = '\0';
+ /* flush any eaten empty line (but the last one) */
+ if (empty_lines > 0) {
+ while (--empty_lines > 0) {
+ FPUTS_TO_TMP_ABORT_IF_FAIL("\n");
}
}
- if (empty_line > 0) {
- while (--empty_line)
- FPUTS_TO_TMP_ABORT_IF_FAIL("\n");
+ /* more emails to expect? */
+ more = !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);
+ 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);
- unlink(tmp_file);
+ g_unlink(tmp_file);
g_free(tmp_file);
return -1;
}
if ((msgnum = folder_item_add_msg(dropfolder, tmp_file, NULL, TRUE)) < 0) {
fclose(mbox_fp);
- unlink(tmp_file);
+ g_unlink(tmp_file);
g_free(tmp_file);
return -1;
}
msginfo = folder_item_get_msginfo(dropfolder, msgnum);
- if (!apply_filter || !procmsg_msginfo_filter(msginfo))
+ if (!apply_filter || !procmsg_msginfo_filter(msginfo)) {
folder_item_move_msg(dest, msginfo);
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_free(msginfo);
+ } else
+ to_filter = g_slist_append(to_filter, msginfo);
msgs++;
- } while (from_line[0] != '\0');
+ } 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);
+ }
folder_item_update_thaw();
gint lock_mbox(const gchar *base, LockType type)
{
+#ifdef G_OS_UNIX
gint retval = 0;
if (type == LOCK_FILE) {
FILE *lockfp;
lockfile = g_strdup_printf("%s.%d", base, getpid());
- if ((lockfp = fopen(lockfile, "wb")) == NULL) {
+ 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");
FILE_OP_ERROR(lockfile, "link");
if (retry >= 5) {
g_warning("can't create %s\n", lockfile);
- unlink(lockfile);
+ g_unlink(lockfile);
g_free(lockfile);
return -1;
}
retry++;
sleep(5);
}
- unlink(lockfile);
+ g_unlink(lockfile);
g_free(lockfile);
} else if (type == LOCK_FLOCK) {
gint lockfd;
+ gboolean fcntled = FALSE;
+#if HAVE_FCNTL_H
+ struct flock fl;
+ fl.l_type = F_WRLCK;
+ fl.l_whence = SEEK_SET;
+ fl.l_start = 0;
+ fl.l_len = 0;
+#endif
#if HAVE_FLOCK
- if ((lockfd = open(base, O_RDONLY)) < 0) {
+ if ((lockfd = open(base, O_RDWR)) < 0) {
#else
if ((lockfd = open(base, O_RDWR)) < 0) {
#endif
FILE_OP_ERROR(base, "open");
return -1;
}
+
+#if HAVE_FCNTL_H
+ if (fcntl(lockfd, F_SETLK, &fl) == -1) {
+ g_warning("can't fnctl %s (%s)", base, strerror(errno));
+ return -1;
+ } else {
+ fcntled = TRUE;
+ }
+#endif
+
#if HAVE_FLOCK
- if (flock(lockfd, LOCK_EX|LOCK_NB) < 0) {
+ if (flock(lockfd, LOCK_EX|LOCK_NB) < 0 && !fcntled) {
perror("flock");
#else
#if HAVE_LOCKF
- if (lockf(lockfd, F_TLOCK, 0) < 0) {
+ if (lockf(lockfd, F_TLOCK, 0) < 0 && !fcntled) {
perror("lockf");
#else
{
}
return retval;
+#else
+ return -1;
+#endif /* G_OS_UNIX */
}
gint unlock_mbox(const gchar *base, gint fd, LockType type)
gchar *lockfile;
lockfile = g_strconcat(base, ".lock", NULL);
- if (unlink(lockfile) < 0) {
+ if (g_unlink(lockfile) < 0) {
FILE_OP_ERROR(lockfile, "unlink");
g_free(lockfile);
return -1;
return 0;
} else if (type == LOCK_FLOCK) {
+ gboolean fcntled = FALSE;
+#if HAVE_FCNTL_H
+ struct flock fl;
+ fl.l_type = F_UNLCK;
+ fl.l_whence = SEEK_SET;
+ fl.l_start = 0;
+ fl.l_len = 0;
+
+ if (fcntl(fd, F_SETLK, &fl) == -1) {
+ g_warning("can't fnctl %s", base);
+ return -1;
+ } else {
+ fcntled = TRUE;
+ }
+#endif
#if HAVE_FLOCK
- if (flock(fd, LOCK_UN) < 0) {
+ if (flock(fd, LOCK_UN) < 0 && !fcntled) {
perror("flock");
#else
#if HAVE_LOCKF
- if (lockf(fd, F_ULOCK, 0) < 0) {
+ if (lockf(fd, F_ULOCK, 0) < 0 && !fcntled) {
perror("lockf");
#else
{
{
FILE *fp;
- if ((fp = fopen(mbox, "wb")) == NULL) {
+ if ((fp = g_fopen(mbox, "wb")) == NULL) {
FILE_OP_ERROR(mbox, "fopen");
g_warning("can't truncate mailbox to zero.\n");
return;
}
gint export_list_to_mbox(GSList *mlist, const gchar *mbox)
+/* return values: -2 skipped, -1 error, 0 OK */
{
GSList *cur;
MsgInfo *msginfo;
FILE *mbox_fp;
gchar buf[BUFFSIZE];
- if ((mbox_fp = fopen(mbox, "wb")) == NULL) {
+ 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)
+ != G_ALERTALTERNATE) {
+ return -2;
+ }
+ }
+
+ if ((mbox_fp = g_fopen(mbox, "wb")) == NULL) {
FILE_OP_ERROR(mbox, "fopen");
+ alertpanel_error(_("Could not create mbox file:\n%s\n"), mbox);
return -1;
}
for (cur = mlist; cur != NULL; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
+ int len;
msg_fp = procmsg_open_message(msginfo);
if (!msg_fp) {
fprintf(mbox_fp, "From %s %s",
buf, ctime(&msginfo->date_t));
+ buf[0] = '\0';
+
+ /* write email to mboxrc */
while (fgets(buf, sizeof(buf), msg_fp) != NULL) {
- if (!strncmp(buf, "From ", 5))
+ /* quote any From, >From, >>From, etc., according to mbox format specs */
+ int offset;
+
+ offset = 0;
+ /* detect leading '>' char(s) */
+ while ((buf[offset] == '>')) {
+ offset++;
+ }
+ if (!strncmp(buf+offset, "From ", 5))
fputc('>', mbox_fp);
fputs(buf, mbox_fp);
}
+
+ /* 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);
+ }
+
+ /* add a trailing empty line */
fputc('\n', mbox_fp);
fclose(msg_fp);
}
/* read all messages in SRC, and store them into one MBOX file. */
+/* return values: -2 skipped, -1 error, 0 OK */
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);
mlist = folder_item_get_msg_list(src);
- export_list_to_mbox(mlist, mbox);
+ ret = export_list_to_mbox(mlist, mbox);
- g_slist_free(mlist);
+ procmsg_msg_list_free(mlist);
- return 0;
+ return ret;
}
projects / claws.git / blobdiff