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

diff --git a/mbox.c b/mbox.c
index cd171b3..e140ee4 100644
--- a/mbox.c
+++ b/mbox.c
@@ -97,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);
@@ -108,14 +104,6 @@ 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);
@@ -137,7 +125,7 @@ static int mmdf_parse_mailbox (CONTEXT * ctx)
 
       if (ctx->msgcount == ctx->hdrmax)
         mx_alloc_memory (ctx);
-      ctx->hdrs[ctx->msgcount] = hdr = mutt_new_header ();
+      ctx->hdrs[ctx->msgcount] = hdr = header_new();
       hdr->offset = loc;
       hdr->index = ctx->msgcount;
 
@@ -233,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);
@@ -246,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;
 
@@ -286,7 +262,7 @@ static int mbox_parse_mailbox (CONTEXT * ctx)
       if (ctx->msgcount == ctx->hdrmax)
         mx_alloc_memory (ctx);
 
-      curhdr = ctx->hdrs[ctx->msgcount] = mutt_new_header ();
+      curhdr = ctx->hdrs[ctx->msgcount] = header_new();
       curhdr->received = t - tz;
       curhdr->offset = loc;
       curhdr->index = ctx->msgcount;
@@ -930,7 +906,7 @@ static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
   p_delete(&ctx->v2r);
   if (ctx->readonly) {
     for (i = 0; i < ctx->msgcount; i++)
-      mutt_free_header (&(ctx->hdrs[i]));       /* nothing to do! */
+      header_delete(&(ctx->hdrs[i]));       /* nothing to do! */
     p_delete(&ctx->hdrs);
   }
   else {
@@ -976,7 +952,7 @@ static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
   if (rc == -1) {
     /* free the old headers */
     for (j = 0; j < old_msgcount; j++)
-      mutt_free_header (&(old_hdrs[j]));
+      header_delete(&(old_hdrs[j]));
     p_delete(&old_hdrs);
 
     ctx->quiet = 0;
@@ -1034,14 +1010,14 @@ static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
         mutt_set_flag (ctx, ctx->hdrs[i], M_TAG, old_hdrs[j]->tagged);
 
         /* we don't need this header any more */
-        mutt_free_header (&(old_hdrs[j]));
+        header_delete(&(old_hdrs[j]));
       }
     }
 
     /* free the remaining old headers */
     for (j = 0; j < old_msgcount; j++) {
       if (old_hdrs[j]) {
-        mutt_free_header (&(old_hdrs[j]));
+        header_delete(&(old_hdrs[j]));
         msg_mod = 1;
       }
     }