/* 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-ui/curses.h>
+#include <lib-sys/mutt_signal.h>
#include "mutt.h"
#include "mx.h"
#include "sort.h"
#include "thread.h"
#include "copy.h"
-
-#ifdef USE_COMPRESSED
#include "compress.h"
-#endif
-
-#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 {
};
-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;
return (r);
}
-void mbox_unlock_mailbox (CONTEXT * ctx)
+static void mbox_unlock_mailbox (CONTEXT * ctx)
{
if (ctx->locked) {
fflush (ctx->fp);
HEADER *hdr;
struct stat sb;
-#ifdef NFS_ATTRIBUTE_HACK
- struct utimbuf newtime;
-#endif
-
if (stat (ctx->path, &sb) == -1) {
mutt_perror (ctx->path);
return (-1);
ctx->mtime = sb.st_mtime;
ctx->size = sb.st_size;
-#ifdef NFS_ATTRIBUTE_HACK
- if (sb.st_mtime > sb.st_atime) {
- newtime.modtime = sb.st_mtime;
- newtime.actime = time (NULL);
- utime (ctx->path, &newtime);
- }
-#endif
-
/* precompute the local timezone to speed up calculation of the
received time */
tz = mutt_local_tz (0);
buf[sizeof (buf) - 1] = 0;
- FOREVER {
+ for (;;) {
if (fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL)
break;
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;
}
}
rfc822_parse_adrlist (hdr->env->return_path, return_path);
if (!hdr->env->from)
- hdr->env->from = rfc822_cpy_adr (hdr->env->return_path);
+ hdr->env->from = address_list_dup (hdr->env->return_path);
ctx->msgcount++;
}
else {
- debug_print (1, ("corrupt mailbox!\n"));
mutt_error _("Mailbox is corrupt!");
return (-1);
int count = 0, lines = 0;
off_t loc;
-#ifdef NFS_ATTRIBUTE_HACK
- struct utimbuf newtime;
-#endif
-
/* Save information about the folder at the time we opened it. */
if (stat (ctx->path, &sb) == -1) {
mutt_perror (ctx->path);
ctx->size = sb.st_size;
ctx->mtime = sb.st_mtime;
-#ifdef NFS_ATTRIBUTE_HACK
- if (sb.st_mtime > sb.st_atime) {
- newtime.modtime = sb.st_mtime;
- newtime.actime = time (NULL);
- utime (ctx->path, &newtime);
- }
-#endif
-
if (!ctx->readonly)
ctx->readonly = access (ctx->path, W_OK) ? 1 : 0;
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 ||
- str_ncmp ("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"));
- }
+ m_strncmp("From ", buf, 5) != 0) {
+ 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);
}
}
rfc822_parse_adrlist (curhdr->env->return_path, return_path);
if (!curhdr->env->from)
- curhdr->env->from = rfc822_cpy_adr (curhdr->env->return_path);
+ curhdr->env->from = address_list_dup (curhdr->env->return_path);
lines = 0;
}
* 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 && str_ncmp ("From ", buffer, 5) == 0)
+ 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);
if (fseeko (ctx->fp, offset, SEEK_SET) != 0 || /* seek the append location */
/* do a sanity check to make sure the mailbox looks ok */
fgets (buf, sizeof (buf), ctx->fp) == NULL ||
- (ctx->magic == M_MBOX && str_ncmp ("From ", buf, 5) != 0) ||
+ (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
*/
{
mx_unlock_file (ctx->path, fileno (ctx->fp), 1);
-#ifdef USE_COMPRESSED
if (ctx->compressinfo)
mutt_slow_close_compressed (ctx);
-#endif
mutt_unblock_signals ();
mx_fastclose_mailbox (ctx);
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;
}
}
struct utimbuf times;
#endif
fgets (tmp, sizeof (tmp), f);
- if (str_ncmp ("From ", tmp, 5) == 0)
+ if (m_strncmp("From ", tmp, 5) == 0)
magic = M_MBOX;
else if (m_strcmp(MMDF_SEP, tmp) == 0)
magic = M_MMDF;
return (-1); /* fopen failed */
}
-#ifdef USE_COMPRESSED
if (magic == -1 && mutt_can_read_compressed (path))
return (M_COMPRESSED);
-#endif
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);
projects / apps / madmutt.git / blobdiff