if (fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL)
break;
- if (safe_strcmp (buf, MMDF_SEP) == 0) {
+ if (mutt_strcmp (buf, MMDF_SEP) == 0) {
loc = ftell (ctx->fp);
count++;
if (0 < tmploc && tmploc < ctx->size) {
if (fseek (ctx->fp, tmploc, SEEK_SET) != 0 ||
fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL ||
- safe_strcmp (MMDF_SEP, buf) != 0) {
+ mutt_strcmp (MMDF_SEP, buf) != 0) {
if (fseek (ctx->fp, loc, SEEK_SET) != 0)
debug_print (1, ("fseek() failed\n"));
hdr->content->length = -1;
if (fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL)
break;
lines++;
- } while (safe_strcmp (buf, MMDF_SEP) != 0);
+ } while (mutt_strcmp (buf, MMDF_SEP) != 0);
hdr->lines = lines;
hdr->content->length = loc - hdr->content->offset;
return (rc);
}
-/* return 1 if address lists are strictly identical */
-static int strict_addrcmp (const ADDRESS * a, const ADDRESS * b)
-{
- while (a && b) {
- if (safe_strcmp (a->mailbox, b->mailbox) ||
- safe_strcmp (a->personal, b->personal))
- return (0);
-
- a = a->next;
- b = b->next;
- }
- if (a || b)
- return (0);
-
- return (1);
-}
-
-static int strict_cmp_lists (const LIST * a, const LIST * b)
-{
- while (a && b) {
- if (safe_strcmp (a->data, b->data))
- return (0);
-
- a = a->next;
- b = b->next;
- }
- if (a || b)
- return (0);
-
- return (1);
-}
-
-static int strict_cmp_envelopes (const ENVELOPE * e1, const ENVELOPE * e2)
-{
- if (e1 && e2) {
- if (safe_strcmp (e1->message_id, e2->message_id) ||
- safe_strcmp (e1->subject, e2->subject) ||
- !strict_cmp_lists (e1->references, e2->references) ||
- !strict_addrcmp (e1->from, e2->from) ||
- !strict_addrcmp (e1->sender, e2->sender) ||
- !strict_addrcmp (e1->reply_to, e2->reply_to) ||
- !strict_addrcmp (e1->to, e2->to) ||
- !strict_addrcmp (e1->cc, e2->cc) ||
- !strict_addrcmp (e1->return_path, e2->return_path))
- return (0);
- else
- return (1);
- }
- else {
- if (e1 == NULL && e2 == NULL)
- return (1);
- else
- return (0);
- }
-}
-
-static int strict_cmp_parameters (const PARAMETER * p1, const PARAMETER * p2)
-{
- while (p1 && p2) {
- if (safe_strcmp (p1->attribute, p2->attribute) ||
- safe_strcmp (p1->value, p2->value))
- return (0);
-
- p1 = p1->next;
- p2 = p2->next;
- }
- if (p1 || p2)
- return (0);
-
- return (1);
-}
-
-static int strict_cmp_bodies (const BODY * b1, const BODY * b2)
-{
- if (b1->type != b2->type ||
- b1->encoding != b2->encoding ||
- safe_strcmp (b1->subtype, b2->subtype) ||
- safe_strcmp (b1->description, b2->description) ||
- !strict_cmp_parameters (b1->parameter, b2->parameter) ||
- b1->length != b2->length)
- return (0);
- return (1);
-}
-
-/* return 1 if headers are strictly identical */
-int mbox_strict_cmp_headers (const HEADER * h1, const HEADER * h2)
-{
- if (h1 && h2) {
- if (h1->received != h2->received ||
- h1->date_sent != h2->date_sent ||
- h1->content->length != h2->content->length ||
- h1->lines != h2->lines ||
- h1->zhours != h2->zhours ||
- h1->zminutes != h2->zminutes ||
- h1->zoccident != h2->zoccident ||
- h1->mime != h2->mime ||
- !strict_cmp_envelopes (h1->env, h2->env) ||
- !strict_cmp_bodies (h1->content, h2->content))
- return (0);
- else
- return (1);
- }
- else {
- if (h1 == NULL && h2 == NULL)
- return (1);
- else
- return (0);
- }
-}
-
/* check to see if the mailbox has changed on disk.
*
* return values:
* 0 no change
* -1 error
*/
-int mbox_check_mailbox (CONTEXT * ctx, int *index_hint)
+static int _mbox_check_mailbox (CONTEXT * ctx, int *index_hint)
{
struct stat st;
char buffer[LONG_STRING];
debug_print (1, ("fseek() failed\n"));
if (fgets (buffer, sizeof (buffer), ctx->fp) != NULL) {
if ((ctx->magic == M_MBOX && safe_strncmp ("From ", buffer, 5) == 0)
- || (ctx->magic == M_MMDF && safe_strcmp (MMDF_SEP, buffer) == 0)) {
+ || (ctx->magic == M_MMDF && mutt_strcmp (MMDF_SEP, buffer) == 0)) {
if (fseek (ctx->fp, ctx->size, SEEK_SET) != 0)
debug_print (1, ("fseek() failed\n"));
if (ctx->magic == M_MBOX)
return (-1);
}
+static int mbox_check_mailbox (CONTEXT* ctx, int* index_hint, int lock) {
+ int rc = 0;
+
+ if (lock) {
+ mutt_block_signals ();
+ if (mbox_lock_mailbox (ctx, 0, 0) == -1) {
+ mutt_unblock_signals ();
+ return M_LOCKED;
+ }
+ }
+
+ rc = _mbox_check_mailbox (ctx, index_hint);
+
+ if (lock) {
+ mutt_unblock_signals ();
+ mbox_unlock_mailbox (ctx);
+ }
+ return rc;
+}
+
/* return values:
* 0 success
* -1 failure
save_sort = Sort;
Sort = SORT_ORDER;
mutt_sort_headers (ctx, 0);
+ Sort = save_sort;
+ need_sort = 1;
}
/* need to open the file for writing in such a way that it does not truncate
}
/* Check to make sure that the file hasn't changed on disk */
- if ((i = mbox_check_mailbox (ctx, index_hint)) == M_NEW_MAIL
+ if ((i = _mbox_check_mailbox (ctx, index_hint)) == M_NEW_MAIL
|| i == M_REOPENED) {
/* new mail arrived, or mailbox reopened */
need_sort = i;
rc = i;
goto bail;
}
- else if (i < 0) {
+ else if (i < 0)
/* fatal error */
- Sort = save_sort;
return (-1);
- }
/* Create a temporary file to write the new version of the mailbox in. */
mutt_mktemp (tempfile);
/* do a sanity check to make sure the mailbox looks ok */
fgets (buf, sizeof (buf), ctx->fp) == NULL ||
(ctx->magic == M_MBOX && safe_strncmp ("From ", buf, 5) != 0) ||
- (ctx->magic == M_MMDF && safe_strcmp (MMDF_SEP, buf) != 0)) {
+ (ctx->magic == M_MMDF && mutt_strcmp (MMDF_SEP, buf) != 0)) {
debug_print (1, ("message not in expected position.\n"));
debug_print (1, ("LINE: %s\n", buf));
i = -1;
mutt_unblock_signals ();
mx_fastclose_mailbox (ctx);
mutt_error _("Fatal error! Could not reopen mailbox!");
-
- Sort = save_sort;
return (-1);
}
FREE (&oldOffset);
unlink (tempfile); /* remove partial copy of the mailbox */
mutt_unblock_signals ();
- Sort = save_sort; /* Restore the default value. */
return (0); /* signal success */
return (-1);
}
- if (need_sort || save_sort != Sort) {
- Sort = save_sort;
+ if (need_sort)
/* if the mailbox was reopened, the thread tree will be invalid so make
* sure to start threading from scratch. */
mutt_sort_headers (ctx, (need_sort == M_REOPENED));
- }
return rc;
}
rc = -1;
}
else {
- cmp_headers = mbox_strict_cmp_headers;
+ cmp_headers = mutt_cmp_header;
if (ctx->magic == M_MBOX)
rc = mbox_parse_mailbox (ctx);
else
fgets (tmp, sizeof (tmp), f);
if (safe_strncmp ("From ", tmp, 5) == 0)
magic = M_MBOX;
- else if (safe_strcmp (MMDF_SEP, tmp) == 0)
+ else if (mutt_strcmp (MMDF_SEP, tmp) == 0)
magic = M_MMDF;
safe_fclose (&f);
#ifndef BUFFY_SIZE
return (magic);
}
+static int commit_message (MESSAGE* msg, CONTEXT* ctx, int mbox) {
+ if ((mbox && fputc ('\n', msg->fp) == EOF) ||
+ (!mbox && fputs (MMDF_SEP, msg->fp) == EOF))
+ return (-1);
+ if ((fflush (msg->fp) == EOF || fsync (fileno (msg->fp)) == -1)) {
+ mutt_perror (_("Can't write message"));
+ return (-1);
+ }
+ return (0);
+}
+
+static int mbox_commit_message (MESSAGE* msg, CONTEXT* ctx) {
+ return (commit_message (msg, ctx, 1));
+}
+
+static int mmdf_commit_message (MESSAGE* msg, CONTEXT* ctx) {
+ return (commit_message (msg, ctx, 0));
+}
+
static mx_t* reg_mx (void) {
mx_t* fmt = safe_calloc (1, sizeof (mx_t));
fmt->local = 1;
fmt->mx_open_mailbox = mbox_open_mailbox;
fmt->mx_open_new_message = mbox_open_new_message;
fmt->mx_sync_mailbox = mbox_sync_mailbox;
+ fmt->mx_check_mailbox = mbox_check_mailbox;
return (fmt);
}
mx_t* mbox_reg_mx (void) {
mx_t* fmt = reg_mx ();
fmt->type = M_MBOX;
+ fmt->mx_commit_message = mbox_commit_message;
return (fmt);
}
mx_t* mmdf_reg_mx (void) {
mx_t* fmt = reg_mx ();
fmt->type = M_MMDF;
+ fmt->mx_commit_message = mmdf_commit_message;
return (fmt);
}
projects / apps / madmutt.git / blobdiff