and more.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/configure.ac b/configure.ac
index 3d3b904..465580c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -652,25 +652,11 @@ if test x$ac_cv_dirent_d_ino = xyes ; then
 fi
 AC_MSG_RESULT($ac_cv_dirent_d_ino)
 
-AC_ARG_ENABLE(nfs-fix, AC_HELP_STRING([--enable-nfs-fix],
-              [Work around an NFS with broken attributes caching]),
-        [if test x$enableval = xyes; then
-                AC_DEFINE(NFS_ATTRIBUTE_HACK,1,
-                  [Define if you have problems with mutt not detecting
-                   new/old mailboxes over NFS.  Some NFS implementations
-                   incorrectly cache the attributes of small files.])
-        fi])
-
 AC_ARG_ENABLE(buffy-size, AC_HELP_STRING([--enable-buffy-size], [Use file size attribute instead of access time]),
         [if test x$enableval = xyes; then
                 AC_DEFINE(BUFFY_SIZE,1,[ Define to enable the "buffy_size" feature. ])
         fi])
 
-AC_ARG_ENABLE(compressed, [  --enable-compressed        Enable compressed folders support ],
-        [if test x$enableval = xyes; then
-                AC_DEFINE(USE_COMPRESSED,1,[ The compressed mailboxes support ])
-        fi])
-
 AC_ARG_ENABLE(locales-fix, AC_HELP_STRING([--enable-locales-fix], [The result of isprint() is unreliable ]),
         [if test x$enableval = xyes; then
                 AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])

diff --git a/mbox.c b/mbox.c
index cd171b3..c3dc0fd 100644 (file)
--- 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);
@@ -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;