X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mbox.c;h=1485ad7c8e3dd79ea2d47aa1e615271032f0b6a3;hp=64d86b8e240323600c308f64b13484b61bb76ad9;hb=7f7a0be369840b290248e5b0302beb447fa1b3cd;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281

diff --git a/mbox.c b/mbox.c
index 64d86b8..1485ad7 100644
--- a/mbox.c
+++ b/mbox.c
@@ -1,19 +1,10 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 /* This file contains code to parse ``mbox'' and ``mmdf'' style mailboxes */
@@ -22,16 +13,24 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
-#include "mailbox.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/debug.h"
+
 #include <sys/stat.h>
 #include <dirent.h>
 #include <string.h>
@@ -44,12 +43,22 @@
 /* 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;
 };
 
+
+static int mbox_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
+{
+  msg->fp = dest->fp;
+  return 0;
+}
+
+/* prototypes */
+static int mbox_reopen_mailbox (CONTEXT*, int*);
+
 /* parameters:
  * ctx - context to lock
  * excl - exclusive lock?
@@ -79,14 +88,14 @@ void mbox_unlock_mailbox (CONTEXT * ctx)
   }
 }
 
-int mmdf_parse_mailbox (CONTEXT * ctx)
+static int mmdf_parse_mailbox (CONTEXT * ctx)
 {
   char buf[HUGE_STRING];
   char return_path[LONG_STRING];
   int count = 0, oldmsgcount = ctx->msgcount;
   int lines;
   time_t t, tz;
-  long loc, tmploc;
+  off_t loc, tmploc;
   HEADER *hdr;
   struct stat sb;
 
@@ -119,8 +128,8 @@ int mmdf_parse_mailbox (CONTEXT * ctx)
     if (fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL)
       break;
 
-    if (mutt_strcmp (buf, MMDF_SEP) == 0) {
-      loc = ftell (ctx->fp);
+    if (str_cmp (buf, MMDF_SEP) == 0) {
+      loc = ftello (ctx->fp);
 
       count++;
       if (!ctx->quiet && ReadInc && ((count % ReadInc == 0) || count == 1))
@@ -136,15 +145,15 @@ int mmdf_parse_mailbox (CONTEXT * ctx)
 
       if (fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL) {
         /* TODO: memory leak??? */
-        dprint (1, (debugfile, "mmdf_parse_mailbox: unexpected EOF\n"));
+        debug_print (1, ("unexpected EOF\n"));
         break;
       }
 
       return_path[0] = 0;
 
       if (!is_from (buf, return_path, sizeof (return_path), &t)) {
-        if (fseek (ctx->fp, loc, SEEK_SET) != 0) {
-          dprint (1, (debugfile, "mmdf_parse_mailbox: fseek() failed\n"));
+        if (fseeko (ctx->fp, loc, SEEK_SET) != 0) {
+          debug_print (1, ("fseeko() failed\n"));
           mutt_error _("Mailbox is corrupt!");
 
           return (-1);
@@ -155,17 +164,17 @@ 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 ||
-              mutt_strcmp (MMDF_SEP, buf) != 0) {
-            if (fseek (ctx->fp, loc, SEEK_SET) != 0)
-              dprint (1, (debugfile, "mmdf_parse_mailbox: fseek() failed\n"));
+              str_cmp (MMDF_SEP, buf) != 0) {
+            if (fseeko (ctx->fp, loc, SEEK_SET) != 0)
+              debug_print (1, ("fseeko() failed\n"));
             hdr->content->length = -1;
           }
         }
@@ -178,11 +187,11 @@ 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 (mutt_strcmp (buf, MMDF_SEP) != 0);
+        } while (str_cmp (buf, MMDF_SEP) != 0);
 
         hdr->lines = lines;
         hdr->content->length = loc - hdr->content->offset;
@@ -198,7 +207,7 @@ int mmdf_parse_mailbox (CONTEXT * ctx)
       ctx->msgcount++;
     }
     else {
-      dprint (1, (debugfile, "mmdf_parse_mailbox: corrupt mailbox!\n"));
+      debug_print (1, ("corrupt mailbox!\n"));
       mutt_error _("Mailbox is corrupt!");
 
       return (-1);
@@ -217,14 +226,14 @@ int mmdf_parse_mailbox (CONTEXT * ctx)
  * NOTE: it is assumed that the mailbox being read has been locked before
  * this routine gets called.  Strange things could happen if it's not!
  */
-int mbox_parse_mailbox (CONTEXT * ctx)
+static int mbox_parse_mailbox (CONTEXT * ctx)
 {
   struct stat sb;
   char buf[HUGE_STRING], return_path[STRING];
   HEADER *curhdr;
   time_t t, tz;
   int count = 0, lines = 0;
-  long loc;
+  off_t loc;
 
 #ifdef NFS_ATTRIBUTE_HACK
   struct utimbuf newtime;
@@ -254,7 +263,7 @@ 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 */
@@ -274,7 +283,7 @@ 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);
@@ -291,9 +300,9 @@ 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) {
@@ -301,16 +310,14 @@ 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 ||
-              mutt_strncmp ("From ", buf, 5) != 0) {
-            dprint (1,
-                    (debugfile,
-                     "mbox_parse_mailbox: bad content-length in message %d (cl=%ld)\n",
-                     curhdr->index, curhdr->content->length));
-            dprint (1, (debugfile, "\tLINE: %s", buf));
-            if (fseek (ctx->fp, loc, SEEK_SET) != 0) {  /* nope, return the previous position */
-              dprint (1, (debugfile, "mbox_parse_mailbox: fseek() failed\n"));
+              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"));
             }
             curhdr->content->length = -1;
           }
@@ -330,8 +337,8 @@ 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)
-              dprint (1, (debugfile, "mbox_parse_mailbox: 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++;
@@ -339,8 +346,8 @@ int mbox_parse_mailbox (CONTEXT * ctx)
           }
 
           /* return to the offset of the next message separator */
-          if (fseek (ctx->fp, tmploc, SEEK_SET) != 0)
-            dprint (1, (debugfile, "mbox_parse_mailbox: fseek() failed\n"));
+          if (fseeko (ctx->fp, tmploc, SEEK_SET) != 0)
+            debug_print (1, ("fseeko() failed\n"));
         }
       }
 
@@ -358,7 +365,7 @@ int mbox_parse_mailbox (CONTEXT * ctx)
     else
       lines++;
 
-    loc = ftell (ctx->fp);
+    loc = ftello (ctx->fp);
   }
 
   /*
@@ -369,7 +376,7 @@ 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;
     }
@@ -386,7 +393,7 @@ int mbox_parse_mailbox (CONTEXT * ctx)
 #undef PREV
 
 /* open a mbox or mmdf style mailbox */
-int mbox_open_mailbox (CONTEXT * ctx)
+static int mbox_open_mailbox (CONTEXT * ctx)
 {
   int rc;
 
@@ -412,116 +419,6 @@ int mbox_open_mailbox (CONTEXT * ctx)
   return (rc);
 }
 
-/* return 1 if address lists are strictly identical */
-static int strict_addrcmp (const ADDRESS * a, const ADDRESS * b)
-{
-  while (a && b) {
-    if (mutt_strcmp (a->mailbox, b->mailbox) ||
-        mutt_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 (mutt_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 (mutt_strcmp (e1->message_id, e2->message_id) ||
-        mutt_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 (mutt_strcmp (p1->attribute, p2->attribute) ||
-        mutt_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 ||
-      mutt_strcmp (b1->subtype, b2->subtype) ||
-      mutt_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:
@@ -531,7 +428,7 @@ int mbox_strict_cmp_headers (const HEADER * h1, const HEADER * h2)
  *	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];
@@ -569,13 +466,13 @@ 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)
-        dprint (1, (debugfile, "mbox_check_mailbox: 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 && mutt_strncmp ("From ", buffer, 5) == 0)
-            || (ctx->magic == M_MMDF && mutt_strcmp (MMDF_SEP, buffer) == 0)) {
-          if (fseek (ctx->fp, ctx->size, SEEK_SET) != 0)
-            dprint (1, (debugfile, "mbox_check_mailbox: fseek() failed\n"));
+        if ((ctx->magic == M_MBOX && str_ncmp ("From ", buffer, 5) == 0)
+            || (ctx->magic == M_MMDF && str_cmp (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
@@ -597,7 +494,7 @@ int mbox_check_mailbox (CONTEXT * ctx, int *index_hint)
           modified = 1;
       }
       else {
-        dprint (1, (debugfile, "mbox_check_mailbox: fgets returned NULL.\n"));
+        debug_print (1, ("fgets returned NULL.\n"));
         modified = 1;
       }
     }
@@ -606,7 +503,7 @@ int mbox_check_mailbox (CONTEXT * ctx, int *index_hint)
   }
 
   if (modified) {
-    if (mutt_reopen_mailbox (ctx, index_hint) != -1) {
+    if (mbox_reopen_mailbox (ctx, index_hint) != -1) {
       if (unlock) {
         mbox_unlock_mailbox (ctx);
         mutt_unblock_signals ();
@@ -625,11 +522,31 @@ int mbox_check_mailbox (CONTEXT * ctx, int *index_hint)
   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
  */
-int mbox_sync_mailbox (CONTEXT * ctx, int *index_hint)
+static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
 {
   char tempfile[_POSIX_PATH_MAX];
   char buf[32];
@@ -637,7 +554,7 @@ int mbox_sync_mailbox (CONTEXT * ctx, 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;
@@ -649,6 +566,8 @@ int mbox_sync_mailbox (CONTEXT * ctx, int *index_hint)
     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
@@ -671,18 +590,16 @@ int mbox_sync_mailbox (CONTEXT * ctx, int *index_hint)
   }
 
   /* 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);
@@ -711,7 +628,7 @@ int mbox_sync_mailbox (CONTEXT * ctx, int *index_hint)
     mutt_error
       _("sync: mbox modified, but no modified messages! (report this bug)");
     mutt_sleep (5);             /* the mutt_error /will/ get cleared! */
-    dprint (1, (debugfile, "mbox_sync_mailbox(): no modified messages.\n"));
+    debug_print (1, ("no modified messages.\n"));
     unlink (tempfile);
     goto bail;
   }
@@ -728,8 +645,8 @@ int mbox_sync_mailbox (CONTEXT * ctx, 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++) {
     /*
@@ -747,7 +664,7 @@ int mbox_sync_mailbox (CONTEXT * ctx, 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) {
@@ -763,7 +680,7 @@ int mbox_sync_mailbox (CONTEXT * ctx, 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,
@@ -781,7 +698,7 @@ int mbox_sync_mailbox (CONTEXT * ctx, 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) {
@@ -806,8 +723,7 @@ int mbox_sync_mailbox (CONTEXT * ctx, int *index_hint)
 
   if (fclose (fp) != 0) {
     fp = NULL;
-    dprint (1,
-            (debugfile, "mbox_sync_mailbox: fclose() returned non-zero.\n"));
+    debug_print (1, ("fclose() returned non-zero.\n"));
     unlink (tempfile);
     mutt_perror (tempfile);
     mutt_sleep (5);
@@ -826,29 +742,25 @@ int mbox_sync_mailbox (CONTEXT * ctx, int *index_hint)
   if ((fp = fopen (tempfile, "r")) == NULL) {
     mutt_unblock_signals ();
     mx_fastclose_mailbox (ctx);
-    dprint (1,
-            (debugfile,
-             "mbox_sync_mailbox: unable to reopen temp copy of mailbox!\n"));
+    debug_print (1, ("unable to reopen temp copy of mailbox!\n"));
     mutt_perror (tempfile);
     mutt_sleep (5);
     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 && mutt_strncmp ("From ", buf, 5) != 0) ||
-      (ctx->magic == M_MMDF && mutt_strcmp (MMDF_SEP, buf) != 0)) {
-    dprint (1,
-            (debugfile,
-             "mbox_sync_mailbox: message not in expected position."));
-    dprint (1, (debugfile, "\tLINE: %s\n", buf));
+      (ctx->magic == M_MBOX && str_ncmp ("From ", buf, 5) != 0) ||
+      (ctx->magic == M_MMDF && str_cmp (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;
-      dprint (1, (debugfile, "mbox_sync_mailbox: fseek() failed\n"));
+      debug_print (1, ("fseeko() failed\n"));
     }
     else {
       /* copy the temp mailbox back into place starting at the first
@@ -862,7 +774,7 @@ int mbox_sync_mailbox (CONTEXT * ctx, 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);
     }
   }
@@ -901,8 +813,6 @@ int mbox_sync_mailbox (CONTEXT * ctx, int *index_hint)
     mutt_unblock_signals ();
     mx_fastclose_mailbox (ctx);
     mutt_error _("Fatal error!  Could not reopen mailbox!");
-
-    Sort = save_sort;
     return (-1);
   }
 
@@ -915,11 +825,10 @@ int mbox_sync_mailbox (CONTEXT * ctx, 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 ();
-  Sort = save_sort;             /* Restore the default value. */
 
   return (0);                   /* signal success */
 
@@ -942,8 +851,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!");
@@ -952,16 +861,27 @@ bail:                          /* Come here in case of disaster */
     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;
 }
 
+static int mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint) {
+#ifdef BUFFY_SIZE
+  BUFFY* tmp = NULL;
+#endif
+  int rc = _mbox_sync_mailbox (ctx, unused, index_hint);
+
+#ifdef BUFFY_SIZE
+  if ((tmp = buffy_find_mailbox (ctx->path)) && tmp->new == 0)
+    buffy_update_mailbox (tmp);
+#endif
+  return (rc);
+}
+
 /* close a mailbox opened in write-mode */
 int mbox_close_mailbox (CONTEXT * ctx)
 {
@@ -977,7 +897,7 @@ int mbox_close_mailbox (CONTEXT * ctx)
   return 0;
 }
 
-int mutt_reopen_mailbox (CONTEXT * ctx, int *index_hint)
+static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
 {
   int (*cmp_headers) (const HEADER *, const HEADER *) = NULL;
   HEADER **old_hdrs;
@@ -1011,11 +931,11 @@ int mutt_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 */
@@ -1039,12 +959,12 @@ int mutt_reopen_mailbox (CONTEXT * ctx, int *index_hint)
   switch (ctx->magic) {
   case M_MBOX:
   case M_MMDF:
-    if (fseek (ctx->fp, 0, SEEK_SET) != 0) {
-      dprint (1, (debugfile, "mutt_reopen_mailbox: fseek() failed\n"));
+    if (fseeko (ctx->fp, 0, SEEK_SET) != 0) {
+      debug_print (1, ("fseeko() failed\n"));
       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
@@ -1061,7 +981,7 @@ int mutt_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);
@@ -1129,7 +1049,7 @@ int mutt_reopen_mailbox (CONTEXT * ctx, int *index_hint)
         msg_mod = 1;
       }
     }
-    FREE (&old_hdrs);
+    p_delete(&old_hdrs);
   }
 
   ctx->quiet = 0;
@@ -1152,3 +1072,94 @@ int mbox_check_empty (const char *path)
 
   return ((st.st_size == 0));
 }
+
+int mbox_is_magic (const char* path, struct stat* st) {
+  int magic = -1;
+  FILE* f;
+  char tmp[_POSIX_PATH_MAX];
+
+  if (S_ISDIR(st->st_mode))
+    return (-1);
+
+  if (st->st_size == 0) {
+    /* hard to tell what zero-length files are, so assume the default magic */
+    if (DefaultMagic == M_MBOX || DefaultMagic == M_MMDF)
+      return (DefaultMagic);
+    else
+      return (M_MBOX);
+  }
+  else if ((f = fopen (path, "r")) != NULL) {
+#ifndef BUFFY_SIZE
+    struct utimbuf times;
+#endif
+    fgets (tmp, sizeof (tmp), f);
+    if (str_ncmp ("From ", tmp, 5) == 0)
+      magic = M_MBOX;
+    else if (str_cmp (MMDF_SEP, tmp) == 0)
+      magic = M_MMDF;
+    safe_fclose (&f);
+#ifndef BUFFY_SIZE
+    /* need to restore the times here, the file was not really accessed,
+     * only the type was accessed.  This is important, because detection
+     * of "new mail" depends on those times set correctly.
+     */
+    times.actime = st->st_atime;
+    times.modtime = st->st_mtime;
+    utime (path, &times);
+#endif
+  } else {
+    mutt_perror (path);
+    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) {
+  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 = p_new(mx_t, 1);
+  fmt->local = 1;
+  fmt->mx_check_empty = mbox_check_empty;
+  fmt->mx_is_magic = mbox_is_magic;
+  fmt->mx_access = access;
+  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);
+}