move rfc822 related types into lib-mime/mime-types.h out of mutt.h.

[apps/madmutt.git] / mbox.c

diff --git a/mbox.c b/mbox.c
index 7a5d875..c3dc0fd 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -14,6 +14,9 @@
 #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"
@@ -22,14 +25,8 @@
 #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>
@@ -100,10 +97,6 @@ static int mmdf_parse_mailbox (CONTEXT * ctx)
   HEADER *hdr;
   struct stat sb;
 
-#ifdef NFS_ATTRIBUTE_HACK
-  struct utimbuf newtime;
-#endif
-
   if (stat (ctx->path, &sb) == -1) {
     mutt_perror (ctx->path);
     return (-1);
@@ -111,25 +104,17 @@ static int mmdf_parse_mailbox (CONTEXT * ctx)
   ctx->mtime = sb.st_mtime;
   ctx->size = sb.st_size;
 
-#ifdef NFS_ATTRIBUTE_HACK
-  if (sb.st_mtime > sb.st_atime) {
-    newtime.modtime = sb.st_mtime;
-    newtime.actime = time (NULL);
-    utime (ctx->path, &newtime);
-  }
-#endif
-
   /* precompute the local timezone to speed up calculation of the
      received time */
   tz = mutt_local_tz (0);
 
   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++;
@@ -173,7 +158,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;
@@ -192,7 +177,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;
@@ -203,7 +188,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++;
     }
@@ -236,10 +221,6 @@ static int mbox_parse_mailbox (CONTEXT * ctx)
   int count = 0, lines = 0;
   off_t loc;
 
-#ifdef NFS_ATTRIBUTE_HACK
-  struct utimbuf newtime;
-#endif
-
   /* Save information about the folder at the time we opened it. */
   if (stat (ctx->path, &sb) == -1) {
     mutt_perror (ctx->path);
@@ -249,14 +230,6 @@ static int mbox_parse_mailbox (CONTEXT * ctx)
   ctx->size = sb.st_size;
   ctx->mtime = sb.st_mtime;
 
-#ifdef NFS_ATTRIBUTE_HACK
-  if (sb.st_mtime > sb.st_atime) {
-    newtime.modtime = sb.st_mtime;
-    newtime.actime = time (NULL);
-    utime (ctx->path, &newtime);
-  }
-#endif
-
   if (!ctx->readonly)
     ctx->readonly = access (ctx->path, W_OK) ? 1 : 0;
 
@@ -313,7 +286,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));
@@ -359,7 +332,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;
     }
@@ -470,8 +443,8 @@ 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)
-            || (ctx->magic == M_MMDF && str_cmp (MMDF_SEP, buffer) == 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"));
           if (ctx->magic == M_MBOX)
@@ -752,8 +725,8 @@ 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_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;
@@ -888,10 +861,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);
@@ -1094,9 +1065,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
@@ -1113,10 +1084,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);
 }