Changeset 5011:b0172175cc89 for buffy.c

Timestamp:

2007-03-20 13:39:29 (21 months ago)

Author:

Miroslav Lichvar <mlichvar@…>

Branch:

default

Message:

Make BUFFY_SIZE a runtime switch ($check_mbox_size)

Files:

• buffy.c (modified) (8 diffs)

buffy.c

@@ -46 +46 @@
 static short BuffyNotify = 0;   /* # of unnotified new boxes */
 
-#ifdef BUFFY_SIZE
-
 /* Find the last message in the file. 
  * upon success return 0. If no message found - return -1 */
@@ -168 +166 @@
   return;
 }
-#endif
 
 int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *err)
@@ -174 +171 @@
   BUFFY **tmp,*tmp1;
   char buf[_POSIX_PATH_MAX];
-#ifdef BUFFY_SIZE
   struct stat sb;
-#endif /* BUFFY_SIZE */
 
   while (MoreArgs (s))
@@ -233 +228 @@
     (*tmp)->newly_created = 0;
 
-#ifdef BUFFY_SIZE
-    /* for buffy_size, it is important that if the folder is new (tested by
+    /* for check_mbox_size, it is important that if the folder is new (tested by
      * reading it), the size is set to 0 so that later when we check we see
-     * that it increased .  without buffy_size we probably don't care.
+     * that it increased .  without check_mbox_size we probably don't care.
      */
-    if (stat ((*tmp)->path, &sb) == 0 && !test_new_folder ((*tmp)->path))
+    if (option(OPTCHECKMBOXSIZE) &&
+        stat ((*tmp)->path, &sb) == 0 && !test_new_folder ((*tmp)->path))
     {
       /* some systems out there don't have an off_t type */
@@ -245 +240 @@
     else
       (*tmp)->size = 0;
-#endif /* BUFFY_SIZE */
   }
   return 0;
 }
 
-#ifdef BUFFY_SIZE
-/* people use buffy_size on systems where modified time attributes are BADLY
- * broken. Ignore them.
+/* people use check_mbox_size on systems where modified time attributes are 
+ * BADLY broken. Ignore them.
  */
-#define STAT_CHECK (sb.st_size > tmp->size)
-#else
-#define STAT_CHECK (sb.st_mtime > sb.st_atime || (tmp->newly_created && sb.st_ctime == sb.st_mtime && sb.st_ctime == sb.st_atime))
-#endif /* BUFFY_SIZE */
+#define STAT_CHECK_SIZE (sb.st_size > tmp->size)
+#define STAT_CHECK_TIME (sb.st_mtime > sb.st_atime || (tmp->newly_created && sb.st_ctime == sb.st_mtime && sb.st_ctime == sb.st_atime))
+#define STAT_CHECK (option(OPTCHECKMBOXSIZE) ? STAT_CHECK_SIZE : STAT_CHECK_TIME)
 
 int mutt_buffy_check (int force)
@@ -324 +316 @@
       tmp->newly_created = 1;
       tmp->magic = 0;
-#ifdef BUFFY_SIZE
       tmp->size = 0;
-#endif
       continue;
     }
@@ -366 +356 @@
           tmp->new = 1;
         }
-#ifdef BUFFY_SIZE
-        else
+        else if (option(OPTCHECKMBOXSIZE))
         {
           /* some other program has deleted mail from the folder */
           tmp->size = (long) sb.st_size;
         }
-#endif
         if (tmp->newly_created &&
             (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
@@ -408 +396 @@
       }
     }
-#ifdef BUFFY_SIZE
-    else if (Context && Context->path)
+    else if (option(OPTCHECKMBOXSIZE) && Context && Context->path)
       tmp->size = (long) sb.st_size;    /* update the size */
-#endif
 
     if (!tmp->new)