X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mbox.c;h=cd171b39af5f5b7cc42f4951a8fe8b0c3245a950;hp=d7d37e84c8b0f085681a9f1cdd22f593efa25aa5;hb=3cb53df6efcb6b137bbab53c16da4eddbc5a1b2b;hpb=eed5352e46df93f8921d2e6dfdc95b027bad6e1e

diff --git a/mbox.c b/mbox.c
index d7d37e8..cd171b3 100644
--- a/mbox.c
+++ b/mbox.c
@@ -16,6 +16,7 @@
 #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"
@@ -24,10 +25,7 @@
 #include "sort.h"
 #include "thread.h"
 #include "copy.h"
-
-#ifdef USE_COMPRESSED
 #include "compress.h"
-#endif
 
 #include "lib/debug.h"
 
@@ -202,7 +200,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++;
     }
@@ -312,7 +310,7 @@ 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) {
+              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));
@@ -358,7 +356,7 @@ 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;
     }
@@ -469,7 +467,7 @@ static int _mbox_check_mailbox (CONTEXT * ctx, int *index_hint)
       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)
+        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"));
@@ -751,7 +749,7 @@ static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
   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));
@@ -887,10 +885,8 @@ int mbox_close_mailbox (CONTEXT * ctx)
 {
   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);
@@ -1093,7 +1089,7 @@ 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 (m_strcmp(MMDF_SEP, tmp) == 0)
       magic = M_MMDF;
@@ -1112,10 +1108,8 @@ int mbox_is_magic (const char* path, struct stat* st) {
     return (-1);         /* fopen failed */
   }
 
-#ifdef USE_COMPRESSED
   if (magic == -1 && mutt_can_read_compressed (path))
     return (M_COMPRESSED);
-#endif
   return (magic);
 }