fix index weirdness if mailbox is emptied while inside the pager (Closes: 375530)

[software/mutt-debian.git] / buffy.c

diff --git a/buffy.c b/buffy.c
index d0998ff255c1b944a26f0e85a7d2ac984db7ef8c..db20c218c57e9fb86f31686763e1584bd1b1f81f 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -48,7 +48,7 @@ static short BuffyNotify = 0; /* # of unnotified new boxes */
 /* Find the last message in the file. 
  * upon success return 0. If no message found - return -1 */
 
 /* Find the last message in the file. 
  * upon success return 0. If no message found - return -1 */
 

-int fseek_last_message (FILE * f)
+static int fseek_last_message (FILE * f)

 {
   LOFF_T pos;
   char buffer[BUFSIZ + 9];     /* 7 for "\n\nFrom " */
 {
   LOFF_T pos;
   char buffer[BUFSIZ + 9];     /* 7 for "\n\nFrom " */


@@ -94,7 +94,7 @@ int fseek_last_message (FILE * f)
 }
 
 /* Return 1 if the last message is new */
 }
 
 /* Return 1 if the last message is new */

-int test_last_status_new (FILE * f)
+static int test_last_status_new (FILE * f)

 {
   HEADER *hdr;
   ENVELOPE* tmp_envelope;
 {
   HEADER *hdr;
   ENVELOPE* tmp_envelope;


@@ -114,7 +114,7 @@ int test_last_status_new (FILE * f)
   return result;
 }
 
   return result;
 }
 

-int test_new_folder (const char *path)
+static int test_new_folder (const char *path)

 {
   FILE *f;
   int rc = 0;
 {
   FILE *f;
   int rc = 0;


@@ -160,7 +160,7 @@ void mutt_update_mailbox (BUFFY * b)
     return;
 
   if (stat (b->path, &sb) == 0)
     return;
 
   if (stat (b->path, &sb) == 0)

-    b->size = (long) sb.st_size;
+    b->size = (off_t) sb.st_size;

   else
     b->size = 0;
   return;
   else
     b->size = 0;
   return;


@@ -235,7 +235,7 @@ int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *e
        stat ((*tmp)->path, &sb) == 0 && !test_new_folder ((*tmp)->path))
     {
       /* some systems out there don't have an off_t type */
        stat ((*tmp)->path, &sb) == 0 && !test_new_folder ((*tmp)->path))
     {
       /* some systems out there don't have an off_t type */

-      (*tmp)->size = (long) sb.st_size;
+      (*tmp)->size = (off_t) sb.st_size;

     }
     else
       (*tmp)->size = 0;
     }
     else
       (*tmp)->size = 0;


@@ -308,7 +308,7 @@ int mutt_buffy_check (int force)
       tmp->magic = M_POP;
     else
 #endif
       tmp->magic = M_POP;
     else
 #endif

-    if (stat (tmp->path, &sb) != 0 || sb.st_size == 0 ||
+    if (stat (tmp->path, &sb) != 0 || (S_ISREG(sb.st_mode) && sb.st_size == 0) ||

        (!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0))
     {
       /* if the mailbox still doesn't exist, set the newly created flag to
        (!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0))
     {
       /* if the mailbox still doesn't exist, set the newly created flag to


@@ -358,7 +358,7 @@ int mutt_buffy_check (int force)
        else if (option(OPTCHECKMBOXSIZE))
        {
          /* some other program has deleted mail from the folder */
        else if (option(OPTCHECKMBOXSIZE))
        {
          /* some other program has deleted mail from the folder */

-         tmp->size = (long) sb.st_size;
+         tmp->size = (off_t) sb.st_size;

        }
        if (tmp->newly_created &&
            (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
        }
        if (tmp->newly_created &&
            (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))


@@ -396,7 +396,7 @@ int mutt_buffy_check (int force)
       }
     }
     else if (option(OPTCHECKMBOXSIZE) && Context && Context->path)
       }
     }
     else if (option(OPTCHECKMBOXSIZE) && Context && Context->path)

-      tmp->size = (long) sb.st_size;   /* update the size */
+      tmp->size = (off_t) sb.st_size;  /* update the size of current folder */

 
     if (!tmp->new)
       tmp->notified = 0;
 
     if (!tmp->new)
       tmp->notified = 0;


@@ -429,7 +429,7 @@ int mutt_buffy_list (void)
       continue;
 
     strfcpy (path, tmp->path, sizeof (path));
       continue;
 
     strfcpy (path, tmp->path, sizeof (path));

-    mutt_pretty_mailbox (path);
+    mutt_pretty_mailbox (path, sizeof (path));

     
     if (!first && pos + strlen (path) >= COLS - 7)
       break;
     
     if (!first && pos + strlen (path) >= COLS - 7)
       break;


@@ -502,7 +502,7 @@ void mutt_buffy (char *s, size_t slen)
       break;
     }
     strfcpy (s, tmp->path, slen);
       break;
     }
     strfcpy (s, tmp->path, slen);

-    mutt_pretty_mailbox (s);
+    mutt_pretty_mailbox (s, slen);

     break;
 
   default:
     break;
 
   default:


@@ -528,7 +528,7 @@ void mutt_buffy (char *s, size_t slen)
       break;
     }
     strfcpy (s, tmp->path, slen);
       break;
     }
     strfcpy (s, tmp->path, slen);

-    mutt_pretty_mailbox (s);
+    mutt_pretty_mailbox (s, slen);

     break;
   }
 }
     break;
   }
 }