/* This file contains code to parse ``mbox'' and ``mmdf'' style mailboxes */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-ui/curses.h>
+#include <lib-sys/mutt_signal.h>
#include "mutt.h"
#include "mx.h"
#include "copy.h"
#include "compress.h"
-#include "lib/debug.h"
-
-#include <sys/stat.h>
-#include <dirent.h>
-#include <string.h>
-#include <utime.h>
-#include <sys/file.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-
/* struct used by mutt_sync_mailbox() to store new offsets */
struct m_update_t {
short valid;
};
-static int mbox_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
+static int mbox_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr __attribute__ ((unused)))
{
msg->fp = dest->fp;
return 0;
if (ctx->msgcount == ctx->hdrmax)
mx_alloc_memory (ctx);
- ctx->hdrs[ctx->msgcount] = hdr = mutt_new_header ();
+ ctx->hdrs[ctx->msgcount] = hdr = header_new();
hdr->offset = loc;
hdr->index = ctx->msgcount;
if (fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL) {
/* TODO: memory leak??? */
- debug_print (1, ("unexpected EOF\n"));
break;
}
if (!is_from (buf, return_path, sizeof (return_path), &t)) {
if (fseeko (ctx->fp, loc, SEEK_SET) != 0) {
- debug_print (1, ("fseeko() failed\n"));
mutt_error _("Mailbox is corrupt!");
return (-1);
if (fseeko (ctx->fp, tmploc, SEEK_SET) != 0 ||
fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL ||
m_strcmp(MMDF_SEP, buf) != 0) {
- if (fseeko (ctx->fp, loc, SEEK_SET) != 0)
- debug_print (1, ("fseeko() failed\n"));
+ fseeko (ctx->fp, loc, SEEK_SET);
hdr->content->length = -1;
}
}
ctx->msgcount++;
}
else {
- debug_print (1, ("corrupt mailbox!\n"));
mutt_error _("Mailbox is corrupt!");
return (-1);
if (ctx->msgcount == ctx->hdrmax)
mx_alloc_memory (ctx);
- curhdr = ctx->hdrs[ctx->msgcount] = mutt_new_header ();
+ curhdr = ctx->hdrs[ctx->msgcount] = header_new();
curhdr->received = t - tz;
curhdr->offset = loc;
curhdr->index = ctx->msgcount;
if (fseeko (ctx->fp, tmploc, SEEK_SET) != 0 ||
fgets (buf, sizeof (buf), ctx->fp) == NULL ||
m_strncmp("From ", buf, 5) != 0) {
- debug_print (1, ("bad content-length in message %d (cl=%zd)\n",
- curhdr->index, curhdr->content->length));
- debug_print (1, ("LINE: %s\n", buf));
- if (fseeko (ctx->fp, loc, SEEK_SET) != 0) { /* nope, return the previous position */
- debug_print (1, ("fseeko() failed\n"));
- }
+ fseeko (ctx->fp, loc, SEEK_SET); /* nope, return the previous position */
curhdr->content->length = -1;
}
}
int cl = curhdr->content->length;
/* count the number of lines in this message */
- if (fseeko (ctx->fp, loc, SEEK_SET) != 0)
- debug_print (1, ("fseeko() failed\n"));
+ fseeko (ctx->fp, loc, SEEK_SET);
while (cl-- > 0) {
if (fgetc (ctx->fp) == '\n')
curhdr->lines++;
}
/* return to the offset of the next message separator */
- if (fseeko (ctx->fp, tmploc, SEEK_SET) != 0)
- debug_print (1, ("fseeko() failed\n"));
+ fseeko(ctx->fp, tmploc, SEEK_SET);
}
}
* see the message separator at *exactly* what used to be the end of the
* folder.
*/
- if (fseeko (ctx->fp, ctx->size, SEEK_SET) != 0)
- debug_print (1, ("fseeko() failed\n"));
+ fseeko (ctx->fp, ctx->size, SEEK_SET);
if (fgets (buffer, sizeof (buffer), ctx->fp) != NULL) {
if ((ctx->magic == M_MBOX && m_strncmp("From ", buffer, 5) == 0)
|| (ctx->magic == M_MMDF && m_strcmp(MMDF_SEP, buffer) == 0)) {
- if (fseeko (ctx->fp, ctx->size, SEEK_SET) != 0)
- debug_print (1, ("fseeko() failed\n"));
+ fseeko (ctx->fp, ctx->size, SEEK_SET);
if (ctx->magic == M_MBOX)
mbox_parse_mailbox (ctx);
else
}
else
modified = 1;
- }
- else {
- debug_print (1, ("fgets returned NULL.\n"));
+ } else {
modified = 1;
}
- }
- else
+ } else {
modified = 1;
+ }
}
if (modified) {
* 0 success
* -1 failure
*/
-static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
+static int _mbox_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused)), int *index_hint)
{
char tempfile[_POSIX_PATH_MAX];
char buf[32];
mutt_error
_("sync: mbox modified, but no modified messages! (report this bug)");
mutt_sleep (5); /* the mutt_error /will/ get cleared! */
- debug_print (1, ("no modified messages.\n"));
unlink (tempfile);
goto bail;
}
*/
newOffset[i - first].body =
ftello (fp) - ctx->hdrs[i]->content->length + offset;
- mutt_free_body (&ctx->hdrs[i]->content->parts);
+ body_list_wipe(&ctx->hdrs[i]->content->parts);
switch (ctx->magic) {
case M_MMDF:
if (fclose (fp) != 0) {
fp = NULL;
- debug_print (1, ("fclose() returned non-zero.\n"));
unlink (tempfile);
mutt_perror (tempfile);
mutt_sleep (5);
if ((fp = fopen (tempfile, "r")) == NULL) {
mutt_unblock_signals ();
mx_fastclose_mailbox (ctx);
- debug_print (1, ("unable to reopen temp copy of mailbox!\n"));
mutt_perror (tempfile);
mutt_sleep (5);
return (-1);
fgets (buf, sizeof (buf), ctx->fp) == NULL ||
(ctx->magic == M_MBOX && m_strncmp("From ", buf, 5) != 0) ||
(ctx->magic == M_MMDF && m_strcmp(MMDF_SEP, buf) != 0)) {
- debug_print (1, ("message not in expected position.\n"));
- debug_print (1, ("LINE: %s\n", buf));
i = -1;
}
else {
if (fseeko (ctx->fp, offset, SEEK_SET) != 0) { /* return to proper offset */
i = -1;
- debug_print (1, ("fseeko() failed\n"));
- }
- else {
+ } else {
/* copy the temp mailbox back into place starting at the first
* change/deleted message
*/
p_delete(&ctx->v2r);
if (ctx->readonly) {
for (i = 0; i < ctx->msgcount; i++)
- mutt_free_header (&(ctx->hdrs[i])); /* nothing to do! */
+ header_delete(&(ctx->hdrs[i])); /* nothing to do! */
p_delete(&ctx->hdrs);
}
else {
case M_MBOX:
case M_MMDF:
if (fseeko (ctx->fp, 0, SEEK_SET) != 0) {
- debug_print (1, ("fseeko() failed\n"));
rc = -1;
}
else {
if (rc == -1) {
/* free the old headers */
for (j = 0; j < old_msgcount; j++)
- mutt_free_header (&(old_hdrs[j]));
+ header_delete(&(old_hdrs[j]));
p_delete(&old_hdrs);
ctx->quiet = 0;
mutt_set_flag (ctx, ctx->hdrs[i], M_TAG, old_hdrs[j]->tagged);
/* we don't need this header any more */
- mutt_free_header (&(old_hdrs[j]));
+ header_delete(&(old_hdrs[j]));
}
}
/* free the remaining old headers */
for (j = 0; j < old_msgcount; j++) {
if (old_hdrs[j]) {
- mutt_free_header (&(old_hdrs[j]));
+ header_delete(&(old_hdrs[j]));
msg_mod = 1;
}
}
return (magic);
}
-static int commit_message (MESSAGE* msg, CONTEXT* ctx, int mbox) {
+static int commit_message (MESSAGE* msg, CONTEXT* ctx __attribute__ ((unused)), int mbox) {
if ((mbox && fputc ('\n', msg->fp) == EOF) ||
(!mbox && fputs (MMDF_SEP, msg->fp) == EOF))
return (-1);