X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mbox.c;h=3cdd76e31f5bd621e6d78a9dd0a596f94df271ed;hp=bafb7f3db0f6a55b2770a632eaf5d6d8a7073200;hb=8376ae73a59f4a6075ab91bf99fe97b394a58d79;hpb=b2a6a9673e124c222f921650a6f0025b64ab2145

diff --git a/mbox.c b/mbox.c
index bafb7f3..3cdd76e 100644
--- a/mbox.c
+++ b/mbox.c
@@ -15,6 +15,7 @@
 
 #include "mutt.h"
 #include "mx.h"
+#include "buffy.h"
 #include "mbox.h"
 #include "sort.h"
 #include "copy.h"
@@ -26,6 +27,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 #include <sys/stat.h>
 #include <dirent.h>
@@ -46,12 +48,15 @@ struct m_update_t {
 };
 
 
-int mbox_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
+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?
@@ -81,7 +86,7 @@ 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];
@@ -121,7 +126,7 @@ int mmdf_parse_mailbox (CONTEXT * ctx)
     if (fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL)
       break;
 
-    if (safe_strcmp (buf, MMDF_SEP) == 0) {
+    if (mutt_strcmp (buf, MMDF_SEP) == 0) {
       loc = ftell (ctx->fp);
 
       count++;
@@ -138,7 +143,7 @@ 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;
       }
 
@@ -146,7 +151,7 @@ int mmdf_parse_mailbox (CONTEXT * ctx)
 
       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"));
+          debug_print (1, ("fseek() failed\n"));
           mutt_error _("Mailbox is corrupt!");
 
           return (-1);
@@ -165,9 +170,9 @@ int mmdf_parse_mailbox (CONTEXT * ctx)
         if (0 < tmploc && tmploc < ctx->size) {
           if (fseek (ctx->fp, tmploc, SEEK_SET) != 0 ||
               fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL ||
-              safe_strcmp (MMDF_SEP, buf) != 0) {
+              mutt_strcmp (MMDF_SEP, buf) != 0) {
             if (fseek (ctx->fp, loc, SEEK_SET) != 0)
-              dprint (1, (debugfile, "mmdf_parse_mailbox: fseek() failed\n"));
+              debug_print (1, ("fseek() failed\n"));
             hdr->content->length = -1;
           }
         }
@@ -184,7 +189,7 @@ int mmdf_parse_mailbox (CONTEXT * ctx)
           if (fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL)
             break;
           lines++;
-        } while (safe_strcmp (buf, MMDF_SEP) != 0);
+        } while (mutt_strcmp (buf, MMDF_SEP) != 0);
 
         hdr->lines = lines;
         hdr->content->length = loc - hdr->content->offset;
@@ -200,7 +205,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);
@@ -219,7 +224,7 @@ 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];
@@ -306,13 +311,11 @@ int mbox_parse_mailbox (CONTEXT * ctx)
           if (fseek (ctx->fp, tmploc, SEEK_SET) != 0 ||
               fgets (buf, sizeof (buf), ctx->fp) == NULL ||
               safe_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));
+            debug_print (1, ("bad content-length in message %d (cl=%ld)\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 */
-              dprint (1, (debugfile, "mbox_parse_mailbox: fseek() failed\n"));
+              debug_print (1, ("fseek() failed\n"));
             }
             curhdr->content->length = -1;
           }
@@ -333,7 +336,7 @@ int mbox_parse_mailbox (CONTEXT * ctx)
 
             /* 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"));
+              debug_print (1, ("fseek() failed\n"));
             while (cl-- > 0) {
               if (fgetc (ctx->fp) == '\n')
                 curhdr->lines++;
@@ -342,7 +345,7 @@ 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"));
+            debug_print (1, ("fseek() failed\n"));
         }
       }
 
@@ -388,7 +391,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;
 
@@ -418,8 +421,8 @@ int mbox_open_mailbox (CONTEXT * ctx)
 static int strict_addrcmp (const ADDRESS * a, const ADDRESS * b)
 {
   while (a && b) {
-    if (safe_strcmp (a->mailbox, b->mailbox) ||
-        safe_strcmp (a->personal, b->personal))
+    if (mutt_strcmp (a->mailbox, b->mailbox) ||
+        mutt_strcmp (a->personal, b->personal))
       return (0);
 
     a = a->next;
@@ -434,7 +437,7 @@ static int strict_addrcmp (const ADDRESS * a, const ADDRESS * b)
 static int strict_cmp_lists (const LIST * a, const LIST * b)
 {
   while (a && b) {
-    if (safe_strcmp (a->data, b->data))
+    if (mutt_strcmp (a->data, b->data))
       return (0);
 
     a = a->next;
@@ -449,8 +452,8 @@ static int strict_cmp_lists (const LIST * a, const LIST * b)
 static int strict_cmp_envelopes (const ENVELOPE * e1, const ENVELOPE * e2)
 {
   if (e1 && e2) {
-    if (safe_strcmp (e1->message_id, e2->message_id) ||
-        safe_strcmp (e1->subject, e2->subject) ||
+    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) ||
@@ -473,8 +476,8 @@ static int strict_cmp_envelopes (const ENVELOPE * e1, const ENVELOPE * e2)
 static int strict_cmp_parameters (const PARAMETER * p1, const PARAMETER * p2)
 {
   while (p1 && p2) {
-    if (safe_strcmp (p1->attribute, p2->attribute) ||
-        safe_strcmp (p1->value, p2->value))
+    if (mutt_strcmp (p1->attribute, p2->attribute) ||
+        mutt_strcmp (p1->value, p2->value))
       return (0);
 
     p1 = p1->next;
@@ -490,8 +493,8 @@ static int strict_cmp_bodies (const BODY * b1, const BODY * b2)
 {
   if (b1->type != b2->type ||
       b1->encoding != b2->encoding ||
-      safe_strcmp (b1->subtype, b2->subtype) ||
-      safe_strcmp (b1->description, b2->description) ||
+      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);
@@ -533,7 +536,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];
@@ -572,12 +575,12 @@ int mbox_check_mailbox (CONTEXT * ctx, int *index_hint)
        * folder.
        */
       if (fseek (ctx->fp, ctx->size, SEEK_SET) != 0)
-        dprint (1, (debugfile, "mbox_check_mailbox: fseek() failed\n"));
+        debug_print (1, ("fseek() failed\n"));
       if (fgets (buffer, sizeof (buffer), ctx->fp) != NULL) {
         if ((ctx->magic == M_MBOX && safe_strncmp ("From ", buffer, 5) == 0)
-            || (ctx->magic == M_MMDF && safe_strcmp (MMDF_SEP, buffer) == 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"));
+            debug_print (1, ("fseek() failed\n"));
           if (ctx->magic == M_MBOX)
             mbox_parse_mailbox (ctx);
           else
@@ -599,7 +602,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;
       }
     }
@@ -627,11 +630,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];
@@ -673,7 +696,7 @@ 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;
@@ -713,7 +736,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;
   }
@@ -808,8 +831,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);
@@ -828,9 +850,7 @@ 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);
@@ -840,17 +860,15 @@ int mbox_sync_mailbox (CONTEXT * ctx, 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 && safe_strncmp ("From ", buf, 5) != 0) ||
-      (ctx->magic == M_MMDF && safe_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_MMDF && mutt_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 */
       i = -1;
-      dprint (1, (debugfile, "mbox_sync_mailbox: fseek() failed\n"));
+      debug_print (1, ("fseek() failed\n"));
     }
     else {
       /* copy the temp mailbox back into place starting at the first
@@ -964,6 +982,19 @@ bail:                          /* Come here in case of disaster */
   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)
 {
@@ -979,7 +1010,7 @@ int mbox_close_mailbox (CONTEXT * ctx)
   return 0;
 }
 
-int mbox_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;
@@ -1042,7 +1073,7 @@ int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
   case M_MBOX:
   case M_MMDF:
     if (fseek (ctx->fp, 0, SEEK_SET) != 0) {
-      dprint (1, (debugfile, "mbox_reopen_mailbox: fseek() failed\n"));
+      debug_print (1, ("fseek() failed\n"));
       rc = -1;
     }
     else {
@@ -1177,7 +1208,7 @@ int mbox_is_magic (const char* path, struct stat* st) {
     fgets (tmp, sizeof (tmp), f);
     if (safe_strncmp ("From ", tmp, 5) == 0)
       magic = M_MBOX;
-    else if (safe_strcmp (MMDF_SEP, tmp) == 0)
+    else if (mutt_strcmp (MMDF_SEP, tmp) == 0)
       magic = M_MMDF;
     safe_fclose (&f);
 #ifndef BUFFY_SIZE
@@ -1208,6 +1239,9 @@ static mx_t* reg_mx (void) {
   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);
 }