X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mbox.c;h=c3dc0fd185cb1c93a5e6684d7b43e392f7564052;hp=7207ea73dd2ab399cf1d78b15ff9c007a98972aa;hb=b8c71f93b0296f815a6538182343ba67e88c0012;hpb=33d07d4040a973a004c4a729fd1f56a63a7203e6

diff --git a/mbox.c b/mbox.c
index 7207ea7..c3dc0fd 100644
--- a/mbox.c
+++ b/mbox.c
@@ -25,10 +25,7 @@
 #include "sort.h"
 #include "thread.h"
 #include "copy.h"
-
-#ifdef USE_COMPRESSED
 #include "compress.h"
-#endif
 
 #include "lib/debug.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,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);
@@ -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;
 
@@ -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);
@@ -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);
 }