X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mbox.c;h=7207ea73dd2ab399cf1d78b15ff9c007a98972aa;hp=7309d070db17428a522be1a5fb3d9020e07f63df;hb=3c3c535e5ed1d651c6024b5acf670e217af473f7;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/mbox.c b/mbox.c
index 7309d07..7207ea7 100644
--- a/mbox.c
+++ b/mbox.c
@@ -13,20 +13,23 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+
 #include "mutt.h"
 #include "mx.h"
 #include "buffy.h"
 #include "mbox.h"
 #include "sort.h"
+#include "thread.h"
 #include "copy.h"
 
 #ifdef USE_COMPRESSED
 #include "compress.h"
 #endif
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <sys/stat.h>
@@ -41,10 +44,10 @@
 /* struct used by mutt_sync_mailbox() to store new offsets */
 struct m_update_t {
   short valid;
-  long hdr;
-  long body;
+  off_t hdr;
+  off_t body;
   long lines;
-  long length;
+  off_t length;
 };
 
 
@@ -93,7 +96,7 @@ static int mmdf_parse_mailbox (CONTEXT * ctx)
   int count = 0, oldmsgcount = ctx->msgcount;
   int lines;
   time_t t, tz;
-  long loc, tmploc;
+  off_t loc, tmploc;
   HEADER *hdr;
   struct stat sb;
 
@@ -122,12 +125,12 @@ 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) {
-      loc = ftell (ctx->fp);
+    if (m_strcmp(buf, MMDF_SEP) == 0) {
+      loc = ftello (ctx->fp);
 
       count++;
       if (!ctx->quiet && ReadInc && ((count % ReadInc == 0) || count == 1))
@@ -150,8 +153,8 @@ static int mmdf_parse_mailbox (CONTEXT * ctx)
       return_path[0] = 0;
 
       if (!is_from (buf, return_path, sizeof (return_path), &t)) {
-        if (fseek (ctx->fp, loc, SEEK_SET) != 0) {
-          debug_print (1, ("fseek() failed\n"));
+        if (fseeko (ctx->fp, loc, SEEK_SET) != 0) {
+          debug_print (1, ("fseeko() failed\n"));
           mutt_error _("Mailbox is corrupt!");
 
           return (-1);
@@ -162,17 +165,17 @@ static int mmdf_parse_mailbox (CONTEXT * ctx)
 
       hdr->env = mutt_read_rfc822_header (ctx->fp, hdr, 0, 0);
 
-      loc = ftell (ctx->fp);
+      loc = ftello (ctx->fp);
 
       if (hdr->content->length > 0 && hdr->lines > 0) {
         tmploc = loc + hdr->content->length;
 
         if (0 < tmploc && tmploc < ctx->size) {
-          if (fseek (ctx->fp, tmploc, SEEK_SET) != 0 ||
+          if (fseeko (ctx->fp, tmploc, SEEK_SET) != 0 ||
               fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL ||
-              str_cmp (MMDF_SEP, buf) != 0) {
-            if (fseek (ctx->fp, loc, SEEK_SET) != 0)
-              debug_print (1, ("fseek() failed\n"));
+              m_strcmp(MMDF_SEP, buf) != 0) {
+            if (fseeko (ctx->fp, loc, SEEK_SET) != 0)
+              debug_print (1, ("fseeko() failed\n"));
             hdr->content->length = -1;
           }
         }
@@ -185,11 +188,11 @@ static int mmdf_parse_mailbox (CONTEXT * ctx)
       if (hdr->content->length < 0) {
         lines = -1;
         do {
-          loc = ftell (ctx->fp);
+          loc = ftello (ctx->fp);
           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;
@@ -200,7 +203,7 @@ static int mmdf_parse_mailbox (CONTEXT * ctx)
           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++;
     }
@@ -231,7 +234,7 @@ static int mbox_parse_mailbox (CONTEXT * ctx)
   HEADER *curhdr;
   time_t t, tz;
   int count = 0, lines = 0;
-  long loc;
+  off_t loc;
 
 #ifdef NFS_ATTRIBUTE_HACK
   struct utimbuf newtime;
@@ -261,7 +264,7 @@ static int mbox_parse_mailbox (CONTEXT * ctx)
      date received */
   tz = mutt_local_tz (0);
 
-  loc = ftell (ctx->fp);
+  loc = ftello (ctx->fp);
   while (fgets (buf, sizeof (buf), ctx->fp) != NULL) {
     if (is_from (buf, return_path, sizeof (return_path), &t)) {
       /* Save the Content-Length of the previous message */
@@ -281,7 +284,7 @@ static int mbox_parse_mailbox (CONTEXT * ctx)
 
       if (!ctx->quiet && ReadInc && ((count % ReadInc == 0) || count == 1))
         mutt_message (_("Reading %s... %d (%d%%)"), ctx->path, count,
-                      (int) (ftell (ctx->fp) / (ctx->size / 100 + 1)));
+                      (int) (ftello (ctx->fp) / (ctx->size / 100 + 1)));
 
       if (ctx->msgcount == ctx->hdrmax)
         mx_alloc_memory (ctx);
@@ -298,9 +301,9 @@ static int mbox_parse_mailbox (CONTEXT * ctx)
        * save time by not having to search for the next message marker).
        */
       if (curhdr->content->length > 0) {
-        long tmploc;
+        off_t tmploc;
 
-        loc = ftell (ctx->fp);
+        loc = ftello (ctx->fp);
         tmploc = loc + curhdr->content->length + 1;
 
         if (0 < tmploc && tmploc < ctx->size) {
@@ -308,14 +311,14 @@ static int mbox_parse_mailbox (CONTEXT * ctx)
            * check to see if the content-length looks valid.  we expect to
            * to see a valid message separator at this point in the stream
            */
-          if (fseek (ctx->fp, tmploc, SEEK_SET) != 0 ||
+          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=%ld)\n",
-                        curhdr->index, curhdr->content->length));
+              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 (fseek (ctx->fp, loc, SEEK_SET) != 0) {  /* nope, return the previous position */
-              debug_print (1, ("fseek() failed\n"));
+            if (fseeko (ctx->fp, loc, SEEK_SET) != 0) {  /* nope, return the previous position */
+              debug_print (1, ("fseeko() failed\n"));
             }
             curhdr->content->length = -1;
           }
@@ -335,8 +338,8 @@ static int mbox_parse_mailbox (CONTEXT * ctx)
             int cl = curhdr->content->length;
 
             /* count the number of lines in this message */
-            if (fseek (ctx->fp, loc, SEEK_SET) != 0)
-              debug_print (1, ("fseek() failed\n"));
+            if (fseeko (ctx->fp, loc, SEEK_SET) != 0)
+              debug_print (1, ("fseeko() failed\n"));
             while (cl-- > 0) {
               if (fgetc (ctx->fp) == '\n')
                 curhdr->lines++;
@@ -344,8 +347,8 @@ static int mbox_parse_mailbox (CONTEXT * ctx)
           }
 
           /* return to the offset of the next message separator */
-          if (fseek (ctx->fp, tmploc, SEEK_SET) != 0)
-            debug_print (1, ("fseek() failed\n"));
+          if (fseeko (ctx->fp, tmploc, SEEK_SET) != 0)
+            debug_print (1, ("fseeko() failed\n"));
         }
       }
 
@@ -356,14 +359,14 @@ static int mbox_parse_mailbox (CONTEXT * ctx)
           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;
     }
     else
       lines++;
 
-    loc = ftell (ctx->fp);
+    loc = ftello (ctx->fp);
   }
 
   /*
@@ -374,7 +377,7 @@ static int mbox_parse_mailbox (CONTEXT * ctx)
    */
   if (count > 0) {
     if (PREV->content->length < 0) {
-      PREV->content->length = ftell (ctx->fp) - PREV->content->offset - 1;
+      PREV->content->length = ftello (ctx->fp) - PREV->content->offset - 1;
       if (PREV->content->length < 0)
         PREV->content->length = 0;
     }
@@ -464,13 +467,13 @@ static int _mbox_check_mailbox (CONTEXT * ctx, int *index_hint)
        * see the message separator at *exactly* what used to be the end of the
        * folder.
        */
-      if (fseek (ctx->fp, ctx->size, SEEK_SET) != 0)
-        debug_print (1, ("fseek() failed\n"));
+      if (fseeko (ctx->fp, ctx->size, SEEK_SET) != 0)
+        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)) {
-          if (fseek (ctx->fp, ctx->size, SEEK_SET) != 0)
-            debug_print (1, ("fseek() failed\n"));
+        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"));
           if (ctx->magic == M_MBOX)
             mbox_parse_mailbox (ctx);
           else
@@ -552,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 */
-  long 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;
@@ -643,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 = safe_calloc (ctx->msgcount - first, sizeof (struct m_update_t));
-  oldOffset = safe_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++) {
     /*
@@ -662,7 +665,7 @@ static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
       j++;
       if (!ctx->quiet && WriteInc && ((i % WriteInc) == 0 || j == 1))
         mutt_message (_("Writing messages... %d (%d%%)"), i,
-                      (int) (ftell (ctx->fp) / (ctx->size / 100 + 1)));
+                      (int) (ftello (ctx->fp) / (ctx->size / 100 + 1)));
 
       if (ctx->magic == M_MMDF) {
         if (fputs (MMDF_SEP, fp) == EOF) {
@@ -678,7 +681,7 @@ static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
        * temporary file only contains saved message which are located after
        * `offset' in the real mailbox
        */
-      newOffset[i - first].hdr = ftell (fp) + offset;
+      newOffset[i - first].hdr = ftello (fp) + offset;
 
       if (mutt_copy_message
           (fp, ctx, ctx->hdrs[i], M_CM_UPDATE,
@@ -696,7 +699,7 @@ static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
        * if the user accesses it later.
        */
       newOffset[i - first].body =
-        ftell (fp) - ctx->hdrs[i]->content->length + offset;
+        ftello (fp) - ctx->hdrs[i]->content->length + offset;
       mutt_free_body (&ctx->hdrs[i]->content->parts);
 
       switch (ctx->magic) {
@@ -746,19 +749,19 @@ static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
     return (-1);
   }
 
-  if (fseek (ctx->fp, offset, SEEK_SET) != 0 || /* seek the append location */
+  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_MMDF && str_cmp (MMDF_SEP, buf) != 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 (fseek (ctx->fp, offset, SEEK_SET) != 0) {       /* return to proper offset */
+    if (fseeko (ctx->fp, offset, SEEK_SET) != 0) {       /* return to proper offset */
       i = -1;
-      debug_print (1, ("fseek() failed\n"));
+      debug_print (1, ("fseeko() failed\n"));
     }
     else {
       /* copy the temp mailbox back into place starting at the first
@@ -772,7 +775,7 @@ static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
         i = -1;
     }
     if (i == 0) {
-      ctx->size = ftell (ctx->fp);      /* update the size of the mailbox */
+      ctx->size = ftello (ctx->fp);      /* update the size of the mailbox */
       ftruncate (fileno (ctx->fp), ctx->size);
     }
   }
@@ -823,8 +826,8 @@ static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
       ctx->hdrs[i]->index = j++;
     }
   }
-  FREE (&newOffset);
-  FREE (&oldOffset);
+  p_delete(&newOffset);
+  p_delete(&oldOffset);
   unlink (tempfile);            /* remove partial copy of the mailbox */
   mutt_unblock_signals ();
 
@@ -849,8 +852,8 @@ bail:                          /* Come here in case of disaster */
   mbox_unlock_mailbox (ctx);
 
   mutt_unblock_signals ();
-  FREE (&newOffset);
-  FREE (&oldOffset);
+  p_delete(&newOffset);
+  p_delete(&oldOffset);
 
   if ((ctx->fp = freopen (ctx->path, "r", ctx->fp)) == NULL) {
     mutt_error _("Could not reopen mailbox!");
@@ -929,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);
-  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! */
-    FREE (&ctx->hdrs);
+    p_delete(&ctx->hdrs);
   }
   else {
     /* save the old headers */
@@ -957,8 +960,8 @@ static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
   switch (ctx->magic) {
   case M_MBOX:
   case M_MMDF:
-    if (fseek (ctx->fp, 0, SEEK_SET) != 0) {
-      debug_print (1, ("fseek() failed\n"));
+    if (fseeko (ctx->fp, 0, SEEK_SET) != 0) {
+      debug_print (1, ("fseeko() failed\n"));
       rc = -1;
     }
     else {
@@ -979,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]));
-    FREE (&old_hdrs);
+    p_delete(&old_hdrs);
 
     ctx->quiet = 0;
     return (-1);
@@ -1047,7 +1050,7 @@ static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
         msg_mod = 1;
       }
     }
-    FREE (&old_hdrs);
+    p_delete(&old_hdrs);
   }
 
   ctx->quiet = 0;
@@ -1091,9 +1094,9 @@ int mbox_is_magic (const char* path, struct stat* st) {
     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 (str_cmp (MMDF_SEP, tmp) == 0)
+    else if (m_strcmp(MMDF_SEP, tmp) == 0)
       magic = M_MMDF;
     safe_fclose (&f);
 #ifndef BUFFY_SIZE
@@ -1137,7 +1140,7 @@ static int mmdf_commit_message (MESSAGE* msg, CONTEXT* ctx) {
 }
 
 static mx_t* reg_mx (void) {
-  mx_t* fmt = safe_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;