X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mbox.c;h=cab71ac861d007fa9daa9d723983c51593a459a8;hp=ebbd9ae8bb833a580c17a89b2df8f91a135a4a80;hb=d9960a434f5c00a534a0dabe02ae5ab8d4881569;hpb=c8ceef3ed6424dcb5a6ec835e7d8d9cc00595372 diff --git a/mbox.c b/mbox.c index ebbd9ae..cab71ac 100644 --- a/mbox.c +++ b/mbox.c @@ -13,6 +13,11 @@ # include "config.h" #endif +#include +#include +#include +#include + #include "mutt.h" #include "mx.h" #include "buffy.h" @@ -25,9 +30,6 @@ #include "compress.h" #endif -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" #include "lib/debug.h" #include @@ -42,10 +44,10 @@ /* struct used by mutt_sync_mailbox() to store new offsets */ struct m_update_t { short valid; - LOFF_T hdr; - LOFF_T body; + off_t hdr; + off_t body; long lines; - LOFF_T length; + off_t length; }; @@ -94,7 +96,7 @@ static int mmdf_parse_mailbox (CONTEXT * ctx) int count = 0, oldmsgcount = ctx->msgcount; int lines; time_t t, tz; - LOFF_T loc, tmploc; + off_t loc, tmploc; HEADER *hdr; struct stat sb; @@ -123,11 +125,11 @@ static int mmdf_parse_mailbox (CONTEXT * ctx) buf[sizeof (buf) - 1] = 0; - FOREVER { + for (;;) { if (fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL) break; - if (str_cmp (buf, MMDF_SEP) == 0) { + if (m_strcmp(buf, MMDF_SEP) == 0) { loc = ftello (ctx->fp); count++; @@ -171,7 +173,7 @@ static int mmdf_parse_mailbox (CONTEXT * ctx) if (0 < tmploc && tmploc < ctx->size) { if (fseeko (ctx->fp, tmploc, SEEK_SET) != 0 || fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL || - str_cmp (MMDF_SEP, buf) != 0) { + m_strcmp(MMDF_SEP, buf) != 0) { if (fseeko (ctx->fp, loc, SEEK_SET) != 0) debug_print (1, ("fseeko() failed\n")); hdr->content->length = -1; @@ -190,7 +192,7 @@ static int mmdf_parse_mailbox (CONTEXT * ctx) if (fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL) break; lines++; - } while (str_cmp (buf, MMDF_SEP) != 0); + } while (m_strcmp(buf, MMDF_SEP) != 0); hdr->lines = lines; hdr->content->length = loc - hdr->content->offset; @@ -232,7 +234,7 @@ static int mbox_parse_mailbox (CONTEXT * ctx) HEADER *curhdr; time_t t, tz; int count = 0, lines = 0; - LOFF_T loc; + off_t loc; #ifdef NFS_ATTRIBUTE_HACK struct utimbuf newtime; @@ -299,7 +301,7 @@ static int mbox_parse_mailbox (CONTEXT * ctx) * save time by not having to search for the next message marker). */ if (curhdr->content->length > 0) { - LOFF_T tmploc; + off_t tmploc; loc = ftello (ctx->fp); tmploc = loc + curhdr->content->length + 1; @@ -312,8 +314,8 @@ static int mbox_parse_mailbox (CONTEXT * ctx) 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=" - OFF_T_FMT ")\n", curhdr->index, curhdr->content->length)); + 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")); @@ -469,7 +471,7 @@ static int _mbox_check_mailbox (CONTEXT * ctx, int *index_hint) debug_print (1, ("fseeko() failed\n")); if (fgets (buffer, sizeof (buffer), ctx->fp) != NULL) { if ((ctx->magic == M_MBOX && str_ncmp ("From ", buffer, 5) == 0) - || (ctx->magic == M_MMDF && str_cmp (MMDF_SEP, buffer) == 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")); if (ctx->magic == M_MBOX) @@ -553,7 +555,7 @@ static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint) int rc = -1; int need_sort = 0; /* flag to resort mailbox if new mail arrives */ int first = -1; /* first message to be written */ - LOFF_T offset; /* location in mailbox to write changed messages */ + off_t offset; /* location in mailbox to write changed messages */ struct stat statbuf; struct utimbuf utimebuf; struct m_update_t *newOffset = NULL; @@ -644,8 +646,8 @@ static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint) offset -= (sizeof MMDF_SEP - 1); /* allocate space for the new offsets */ - newOffset = mem_calloc (ctx->msgcount - first, sizeof (struct m_update_t)); - oldOffset = mem_calloc (ctx->msgcount - first, sizeof (struct m_update_t)); + newOffset = p_new(struct m_update_t, ctx->msgcount - first); + oldOffset = p_new(struct m_update_t, ctx->msgcount - first); for (i = first, j = 0; i < ctx->msgcount; i++) { /* @@ -751,7 +753,7 @@ static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint) /* 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_MMDF && str_cmp (MMDF_SEP, buf) != 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; @@ -824,8 +826,8 @@ static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint) ctx->hdrs[i]->index = j++; } } - mem_free (&newOffset); - mem_free (&oldOffset); + p_delete(&newOffset); + p_delete(&oldOffset); unlink (tempfile); /* remove partial copy of the mailbox */ mutt_unblock_signals (); @@ -850,8 +852,8 @@ bail: /* Come here in case of disaster */ mbox_unlock_mailbox (ctx); mutt_unblock_signals (); - mem_free (&newOffset); - mem_free (&oldOffset); + p_delete(&newOffset); + p_delete(&oldOffset); if ((ctx->fp = freopen (ctx->path, "r", ctx->fp)) == NULL) { mutt_error _("Could not reopen mailbox!"); @@ -930,11 +932,11 @@ static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint) if (ctx->subj_hash) hash_destroy (&ctx->subj_hash, NULL); mutt_clear_threads (ctx); - mem_free (&ctx->v2r); + p_delete(&ctx->v2r); if (ctx->readonly) { for (i = 0; i < ctx->msgcount; i++) mutt_free_header (&(ctx->hdrs[i])); /* nothing to do! */ - mem_free (&ctx->hdrs); + p_delete(&ctx->hdrs); } else { /* save the old headers */ @@ -980,7 +982,7 @@ static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint) /* free the old headers */ for (j = 0; j < old_msgcount; j++) mutt_free_header (&(old_hdrs[j])); - mem_free (&old_hdrs); + p_delete(&old_hdrs); ctx->quiet = 0; return (-1); @@ -1048,7 +1050,7 @@ static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint) msg_mod = 1; } } - mem_free (&old_hdrs); + p_delete(&old_hdrs); } ctx->quiet = 0; @@ -1094,7 +1096,7 @@ int mbox_is_magic (const char* path, struct stat* st) { fgets (tmp, sizeof (tmp), f); if (str_ncmp ("From ", tmp, 5) == 0) magic = M_MBOX; - else if (str_cmp (MMDF_SEP, tmp) == 0) + else if (m_strcmp(MMDF_SEP, tmp) == 0) magic = M_MMDF; safe_fclose (&f); #ifndef BUFFY_SIZE @@ -1138,7 +1140,7 @@ static int mmdf_commit_message (MESSAGE* msg, CONTEXT* ctx) { } static mx_t* reg_mx (void) { - mx_t* fmt = mem_calloc (1, sizeof (mx_t)); + mx_t* fmt = p_new(mx_t, 1); fmt->local = 1; fmt->mx_check_empty = mbox_check_empty; fmt->mx_is_magic = mbox_is_magic;