default_flags.perm_flags = MSG_NEW|MSG_UNREAD;
default_flags.tmp_flags = MSG_CACHED;
- if (type == F_MH) {
+ if (type == F_MH || type == F_IMAP) {
if (item->stype == F_QUEUE) {
MSG_SET_TMP_FLAGS(default_flags, MSG_QUEUED);
} else if (item->stype == F_DRAFT) {
MSG_SET_TMP_FLAGS(default_flags, MSG_DRAFT);
}
- } else if (type == F_IMAP) {
+ }
+ if (type == F_IMAP) {
MSG_SET_TMP_FLAGS(default_flags, MSG_IMAP);
} else if (type == F_NEWS) {
MSG_SET_TMP_FLAGS(default_flags, MSG_NEWS);
g_free(path);
}
cache_file = folder_item_get_cache_file(item);
- if ((fp = fopen(cache_file, "r")) == NULL) {
+ if ((fp = fopen(cache_file, "rb")) == NULL) {
debug_print(_("\tNo cache file\n"));
g_free(cache_file);
return NULL;
READ_CACHE_DATA(msginfo->msgid, fp);
READ_CACHE_DATA(msginfo->inreplyto, fp);
READ_CACHE_DATA(msginfo->references, fp);
+ READ_CACHE_DATA(msginfo->xref, fp);
+
MSG_SET_PERM_FLAGS(msginfo->flags, default_flags.perm_flags);
MSG_SET_TMP_FLAGS(msginfo->flags, default_flags.tmp_flags);
WRITE_CACHE_DATA(msginfo->msgid, fp);
WRITE_CACHE_DATA(msginfo->inreplyto, fp);
WRITE_CACHE_DATA(msginfo->references, fp);
+ WRITE_CACHE_DATA(msginfo->xref, fp);
+
}
void procmsg_write_flags(MsgInfo *msginfo, FILE *fp)
WRITE_CACHE_DATA_INT(flags, fp);
}
+void procmsg_flush_mark_queue(FolderItem *item, FILE *fp)
+{
+ MsgInfo *flaginfo;
+
+ g_return_if_fail(item != NULL);
+ g_return_if_fail(fp != NULL);
+
+ while (item->mark_queue != NULL) {
+ flaginfo = (MsgInfo *)item->mark_queue->data;
+ procmsg_write_flags(flaginfo, fp);
+ procmsg_msginfo_free(flaginfo);
+ item->mark_queue = g_slist_remove(item->mark_queue, flaginfo);
+ }
+}
+
+void procmsg_add_flags(FolderItem *item, gint num, MsgFlags flags)
+{
+ FILE *fp;
+ gchar *path;
+ MsgInfo msginfo;
+
+ g_return_if_fail(item != NULL);
+
+ if (item->opened) {
+ MsgInfo *queue_msginfo;
+
+ queue_msginfo = g_new0(MsgInfo, 1);
+ queue_msginfo->msgnum = num;
+ queue_msginfo->flags = flags;
+ item->mark_queue = g_slist_append
+ (item->mark_queue, queue_msginfo);
+ return;
+ }
+
+ path = folder_item_get_path(item);
+ g_return_if_fail(path != NULL);
+
+ if ((fp = procmsg_open_mark_file(path, TRUE)) == NULL) {
+ g_warning(_("can't open mark file\n"));
+ g_free(path);
+ return;
+ }
+ g_free(path);
+
+ msginfo.msgnum = num;
+ msginfo.flags = flags;
+
+ procmsg_write_flags(&msginfo, fp);
+ fclose(fp);
+}
+
struct MarkSum {
gint *new;
gint *unread;
markfile = g_strconcat(folder, G_DIR_SEPARATOR_S, MARK_FILE, NULL);
- if ((fp = fopen(markfile, "r")) == NULL)
+ if ((fp = fopen(markfile, "rb")) == NULL)
debug_print(_("Mark file not found.\n"));
else if (fread(&ver, sizeof(ver), 1, fp) != 1 || MARK_VERSION != ver) {
debug_print(_("Mark version is different (%d != %d). "
if (fp) {
/* reopen with append mode */
fclose(fp);
- if ((fp = fopen(markfile, "a")) == NULL)
+ if ((fp = fopen(markfile, "ab")) == NULL)
g_warning(_("Can't open mark file with append mode.\n"));
} else {
/* open with overwrite mode if mark file doesn't exist or
version is different */
- if ((fp = fopen(markfile, "w")) == NULL)
+ if ((fp = fopen(markfile, "wb")) == NULL)
g_warning(_("Can't open mark file with write mode.\n"));
else {
ver = MARK_VERSION;
g_return_val_if_fail(file != NULL, NULL);
}
- if ((fp = fopen(file, "r")) == NULL) {
+ if ((fp = fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
g_free(file);
return NULL;
}
}
-gint procmsg_send_queue(void)
+gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs)
{
- FolderItem *queue;
gint i;
gint ret = 0;
- queue = folder_get_default_queue();
+ if (!queue)
+ queue = folder_get_default_queue();
g_return_val_if_fail(queue != NULL, -1);
+
folder_item_scan(queue);
if (queue->last_num < 0) return -1;
else if (queue->last_num == 0) return 0;
if (procmsg_send_message_queue(file) < 0) {
g_warning(_("Sending queued message %d failed.\n"), i);
ret = -1;
- } else
+ } else {
+ /* CLAWS:
+ * We save in procmsg_send_message_queue because
+ * we need the destination folder from the queue
+ * header
+
+ if (save_msgs)
+ procmsg_save_to_outbox
+ (queue->folder->outbox,
+ file, TRUE);
+*/
folder_item_remove_msg(queue, i);
+ }
g_free(file);
}
}
return ret;
}
+gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
+ gboolean is_queued)
+{
+ gint num;
+ FILE *fp;
+ MsgFlags flag = {0, 0};
+
+ debug_print(_("saving sent message...\n"));
+
+ if (!outbox)
+ outbox = folder_get_default_outbox();
+ g_return_val_if_fail(outbox != NULL, -1);
+
+ /* remove queueing headers */
+ if (is_queued) {
+ gchar tmp[MAXPATHLEN + 1];
+ gchar buf[BUFFSIZE];
+ FILE *outfp;
+
+ g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg.out.%08x",
+ get_rc_dir(), G_DIR_SEPARATOR, (guint)random());
+ if ((fp = fopen(file, "rb")) == NULL) {
+ FILE_OP_ERROR(file, "fopen");
+ return -1;
+ }
+ if ((outfp = fopen(tmp, "wb")) == NULL) {
+ FILE_OP_ERROR(tmp, "fopen");
+ fclose(fp);
+ return -1;
+ }
+ while (fgets(buf, sizeof(buf), fp) != NULL)
+ if (buf[0] == '\r' || buf[0] == '\n') break;
+ while (fgets(buf, sizeof(buf), fp) != NULL)
+ fputs(buf, outfp);
+ fclose(outfp);
+ fclose(fp);
+ Xstrdup_a(file, tmp, return -1);
+ }
+
+ folder_item_scan(outbox);
+ if ((num = folder_item_add_msg(outbox, file, FALSE)) < 0) {
+ g_warning(_("can't save message\n"));
+ return -1;
+ }
+
+ if(is_queued) {
+ unlink(file);
+ }
+
+ procmsg_add_flags(outbox, num, flag);
+
+ return 0;
+}
+
void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
{
static const gchar *def_cmd = "lpr %s";
prtmp = g_strdup_printf("%s%cprinttmp.%08x",
get_mime_tmp_dir(), G_DIR_SEPARATOR, id++);
- if ((prfp = fopen(prtmp, "w")) == NULL) {
+ if ((prfp = fopen(prtmp, "wb")) == NULL) {
FILE_OP_ERROR(prtmp, "fopen");
g_free(prtmp);
fclose(tmpfp);
MEMBDUP(subject);
MEMBDUP(msgid);
MEMBDUP(inreplyto);
+ MEMBDUP(xref);
MEMBCOPY(folder);
MEMBCOPY(to_folder);
g_free(msginfo->subject);
g_free(msginfo->msgid);
g_free(msginfo->inreplyto);
+ g_free(msginfo->xref);
g_free(msginfo);
}
gchar buf[BUFFSIZE];
gint hnum;
PrefsAccount *mailac = NULL, *newsac = NULL;
- gchar *tmp = NULL;
+ int local = 0;
g_return_val_if_fail(file != NULL, -1);
- if ((fp = fopen(file, "r")) == NULL) {
+ if ((fp = fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
return -1;
}
case Q_SAVE_COPY_FOLDER:
if (!savecopyfolder) savecopyfolder = g_strdup(p);
break;
- default:
}
}
filepos = ftell(fp);
- if(newsgroup_list || prefs_common.savemsg) {
- FILE *tmpfp;
-
- /* write to temporary file */
- tmp = g_strdup_printf("%s%ctmp%d", g_get_tmp_dir(),
- G_DIR_SEPARATOR, (gint)file);
- if ((tmpfp = fopen(tmp, "w")) == NULL) {
- FILE_OP_ERROR(tmp, "fopen");
- newsval = -1;
- }
- if (change_file_mode_rw(tmpfp, tmp) < 0) {
- FILE_OP_ERROR(tmp, "chmod");
- g_warning(_("can't change file mode\n"));
- }
-
- while ((newsval == 0) && fgets(buf, sizeof(buf), fp) != NULL) {
- if (fputs(buf, tmpfp) == EOF) {
- FILE_OP_ERROR(tmp, "fputs");
- newsval = -1;
- }
- }
- fclose(tmpfp);
- }
-
fseek(fp, filepos, SEEK_SET);
if (to_list) {
debug_print(_("Sending message by mail\n"));
if(!from) {
g_warning(_("Queued message header is broken.\n"));
mailval = -1;
+ } else if (mailac && mailac->use_mail_command &&
+ mailac->mail_command && (* mailac->mail_command)) {
+ mailval = send_message_local(mailac->mail_command, fp);
+ local = 1;
} else if (prefs_common.use_extsend && prefs_common.extsend_cmd) {
mailval = send_message_local(prefs_common.extsend_cmd, fp);
+ local = 1;
} else {
if (!mailac) {
mailac = account_find_from_smtp_server(from, smtpserver);
}
}
if (mailval < 0) {
- alertpanel_error(_("Error occurred while sending the message to %s ."),
- mailac ? mailac->smtp_server : smtpserver);
+ if (!local)
+ alertpanel_error(
+ _("Error occurred while sending the message to `%s'."),
+ mailac ? mailac->smtp_server : smtpserver);
+ else
+ alertpanel_error(
+ _("Error occurred while sending the message with command `%s'."),
+ (mailac && mailac->use_mail_command &&
+ mailac->mail_command && (*mailac->mail_command)) ?
+ mailac->mail_command : prefs_common.extsend_cmd);
}
}
if(newsgroup_list && (newsval == 0)) {
Folder *folder;
+ gchar *tmp = NULL;
+ FILE *tmpfp;
- debug_print(_("Sending message by news\n"));
-
- folder = FOLDER(newsac->folder);
-
- newsval = news_post(folder, tmp);
- if (newsval < 0) {
- alertpanel_error(_("Error occurred while posting the message to %s ."),
- newsac->nntp_server);
- }
- }
-
- /* save message to outbox */
- if (mailval == 0 && newsval == 0 && savecopyfolder) {
- FolderItem *folder;
- gchar *path;
- gint num;
- FILE *fp;
-
- debug_print(_("saving sent message...\n"));
+ /* write to temporary file */
+ tmp = g_strdup_printf("%s%ctmp%d", g_get_tmp_dir(),
+ G_DIR_SEPARATOR, (gint)file);
+ if ((tmpfp = fopen(tmp, "wb")) == NULL) {
+ FILE_OP_ERROR(tmp, "fopen");
+ newsval = -1;
+ alertpanel_error(_("Could not create temporary file for news sending."));
+ } else {
+ if (change_file_mode_rw(tmpfp, tmp) < 0) {
+ FILE_OP_ERROR(tmp, "chmod");
+ g_warning(_("can't change file mode\n"));
+ }
+
+ while ((newsval == 0) && fgets(buf, sizeof(buf), fp) != NULL) {
+ if (fputs(buf, tmpfp) == EOF) {
+ FILE_OP_ERROR(tmp, "fputs");
+ newsval = -1;
+ alertpanel_error(_("Error when writing temporary file for news sending."));
+ }
+ }
+ fclose(tmpfp);
- folder = folder_find_item_from_identifier(savecopyfolder);
- if(!folder)
- folder = folder_get_default_outbox();
- path = folder_item_get_path(folder);
- if (!is_dir_exist(path))
- make_dir_hier(path);
+ if(newsval == 0) {
+ debug_print(_("Sending message by news\n"));
- folder_item_scan(folder);
- if ((num = folder_item_add_msg(folder, tmp, FALSE)) < 0) {
- g_warning(_("can't save message\n"));
- }
+ folder = FOLDER(newsac->folder);
- if(num) {
- if ((fp = procmsg_open_mark_file(path, TRUE)) == NULL)
- g_warning(_("can't open mark file\n"));
- else {
- MsgInfo newmsginfo;
-
- newmsginfo.msgnum = num;
- newmsginfo.flags.perm_flags = 0;
- newmsginfo.flags.tmp_flags = 0;
- procmsg_write_flags(&newmsginfo, fp);
- fclose(fp);
+ newsval = news_post(folder, tmp);
+ if (newsval < 0) {
+ alertpanel_error(_("Error occurred while posting the message to %s ."),
+ newsac->nntp_server);
+ }
}
+ unlink(tmp);
}
- g_free(path);
+ g_free(tmp);
}
slist_free_strings(to_list);
g_free(from);
g_free(smtpserver);
fclose(fp);
- if(tmp) {
- unlink(tmp);
- g_free(tmp);
+
+ /* save message to outbox */
+ if (mailval == 0 && newsval == 0 && savecopyfolder) {
+ FolderItem *outbox;
+
+ debug_print(_("saving sent message...\n"));
+
+ outbox = folder_find_item_from_identifier(savecopyfolder);
+ if(!outbox)
+ outbox = folder_get_default_outbox();
+
+ procmsg_save_to_outbox(outbox, file, TRUE);
}
return (newsval != 0 ? newsval : mailval);
projects / claws.git / blobdiff