X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=buffy.c;h=48927d171d2d1707c61273d01f6301a779e0c3fc;hp=e486abad86b6a326d8ef02d84c289a5c7d5c78bf;hb=df70e07e24add1869bcc9b7af2277d9d0c09a281;hpb=f8af67ba35cb4dee7015de7199f34fb141948c6e

diff --git a/buffy.c b/buffy.c
index e486aba..48927d1 100644
--- a/buffy.c
+++ b/buffy.c
@@ -41,12 +41,13 @@
 
 #include <stdio.h>
 
-static time_t BuffyTime = 0;            /* last time we started checking for mail */
+static time_t BuffyTime = 0;    /* last time we started checking for mail */
+
 #ifdef USE_IMAP
 static time_t ImapBuffyTime = 0;        /* last time we started checking for mail */
 #endif
-static short BuffyCount = 0;            /* how many boxes with new mail */
-static short BuffyNotify = 0;           /* # of unnotified new boxes */
+static short BuffyCount = 0;    /* how many boxes with new mail */
+static short BuffyNotify = 0;   /* # of unnotified new boxes */
 
 #ifdef BUFFY_SIZE
 
@@ -56,11 +57,11 @@ static short BuffyNotify = 0;           /* # of unnotified new boxes */
 int fseek_last_message (FILE * f)
 {
   long int pos;
-  char buffer[BUFSIZ + 9];	/* 7 for "\n\nFrom " */
+  char buffer[BUFSIZ + 9];      /* 7 for "\n\nFrom " */
   int bytes_read;
-  int i;			/* Index into `buffer' for scanning.  */
+  int i;                        /* Index into `buffer' for scanning.  */
 
-  memset (buffer, 0, sizeof(buffer));
+  memset (buffer, 0, sizeof (buffer));
   fseek (f, 0, SEEK_END);
   pos = ftell (f);
 
@@ -71,26 +72,23 @@ int fseek_last_message (FILE * f)
     bytes_read = BUFSIZ;
   /* Make `pos' a multiple of `BUFSIZ' (0 if the file is short), so that all
    * reads will be on block boundaries, which might increase efficiency.  */
-  while ((pos -= bytes_read) >= 0)
-  {
+  while ((pos -= bytes_read) >= 0) {
     /* we save in the buffer at the end the first 7 chars from the last read */
-    strncpy (buffer + BUFSIZ, buffer, 5+2); /* 2 == 2 * mutt_strlen(CRLF) */
+    strncpy (buffer + BUFSIZ, buffer, 5 + 2);   /* 2 == 2 * mutt_strlen(CRLF) */
     fseek (f, pos, SEEK_SET);
     bytes_read = fread (buffer, sizeof (char), bytes_read, f);
     if (bytes_read == -1)
       return -1;
     for (i = bytes_read; --i >= 0;)
-      if (!mutt_strncmp (buffer + i, "\n\nFrom ", mutt_strlen ("\n\nFrom ")))
-      {				/* found it - go to the beginning of the From */
-	fseek (f, pos + i + 2, SEEK_SET);
-	return 0;
+      if (!mutt_strncmp (buffer + i, "\n\nFrom ", mutt_strlen ("\n\nFrom "))) { /* found it - go to the beginning of the From */
+        fseek (f, pos + i + 2, SEEK_SET);
+        return 0;
       }
     bytes_read = BUFSIZ;
   }
 
   /* here we are at the beginning of the file */
-  if (!mutt_strncmp ("From ", buffer, 5))
-  {
+  if (!mutt_strncmp ("From ", buffer, 5)) {
     fseek (f, 0, 0);
     return (0);
   }
@@ -102,7 +100,7 @@ int fseek_last_message (FILE * f)
 int test_last_status_new (FILE * f)
 {
   HEADER *hdr;
-  ENVELOPE* tmp_envelope;
+  ENVELOPE *tmp_envelope;
   int result = 0;
 
   if (fseek_last_message (f) == -1)
@@ -113,7 +111,7 @@ int test_last_status_new (FILE * f)
   if (!(hdr->read || hdr->old))
     result = 1;
 
-  mutt_free_envelope(&tmp_envelope);
+  mutt_free_envelope (&tmp_envelope);
   mutt_free_header (&hdr);
 
   return result;
@@ -130,8 +128,7 @@ int test_new_folder (const char *path)
   if (typ != M_MBOX && typ != M_MMDF)
     return 0;
 
-  if ((f = fopen (path, "rb")))
-  {
+  if ((f = fopen (path, "rb"))) {
     rc = test_last_status_new (f);
     fclose (f);
   }
@@ -144,14 +141,13 @@ BUFFY *mutt_find_mailbox (const char *path)
   BUFFY *tmp = NULL;
   struct stat sb;
   struct stat tmp_sb;
-  
-  if (stat (path,&sb) != 0)
+
+  if (stat (path, &sb) != 0)
     return NULL;
 
-  for (tmp = Incoming; tmp; tmp = tmp->next)
-  {
-    if (stat (tmp->path,&tmp_sb) ==0 && 
-	sb.st_dev == tmp_sb.st_dev && sb.st_ino == tmp_sb.st_ino)
+  for (tmp = Incoming; tmp; tmp = tmp->next) {
+    if (stat (tmp->path, &tmp_sb) == 0 &&
+        sb.st_dev == tmp_sb.st_dev && sb.st_ino == tmp_sb.st_ino)
       break;
   }
   return tmp;
@@ -172,27 +168,26 @@ void mutt_update_mailbox (BUFFY * b)
 }
 #endif
 
-int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *err)
+int mutt_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data,
+                          BUFFER * err)
 {
-  BUFFY **tmp,*tmp1;
+  BUFFY **tmp, *tmp1;
   char buf[_POSIX_PATH_MAX];
+
 #ifdef BUFFY_SIZE
   struct stat sb;
 #endif /* BUFFY_SIZE */
 
-  while (MoreArgs (s))
-  {
+  while (MoreArgs (s)) {
     mutt_extract_token (path, s, 0);
     strfcpy (buf, path->data, sizeof (buf));
 
-    if(data == M_UNMAILBOXES && mutt_strcmp(buf,"*") == 0)
-    {
-      for (tmp = &Incoming; *tmp;)
-      {
+    if (data == M_UNMAILBOXES && mutt_strcmp (buf, "*") == 0) {
+      for (tmp = &Incoming; *tmp;) {
         FREE (&((*tmp)->path));
-        tmp1=(*tmp)->next;
+        tmp1 = (*tmp)->next;
         FREE (tmp);
-        *tmp=tmp1;
+        *tmp = tmp1;
       }
       return 0;
     }
@@ -200,35 +195,32 @@ int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *e
     mutt_expand_path (buf, sizeof (buf));
 
     /* Skip empty tokens. */
-    if(!*buf) continue;
+    if (!*buf)
+      continue;
 
     /* simple check to avoid duplicates */
-    for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next))
-    {
+    for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next)) {
       if (mutt_strcmp (buf, (*tmp)->path) == 0)
-	break;
+        break;
     }
 
-    if(data == M_UNMAILBOXES)
-    {
-      if(*tmp)
-      {
+    if (data == M_UNMAILBOXES) {
+      if (*tmp) {
         FREE (&((*tmp)->path));
-        tmp1=(*tmp)->next;
+        tmp1 = (*tmp)->next;
         FREE (tmp);
-        *tmp=tmp1;
+        *tmp = tmp1;
       }
       continue;
     }
 
-    if (!*tmp)
-    {
+    if (!*tmp) {
       *tmp = (BUFFY *) safe_calloc (1, sizeof (BUFFY));
       (*tmp)->path = safe_strdup (buf);
       (*tmp)->next = NULL;
       /* it is tempting to set magic right here */
       (*tmp)->magic = 0;
-      
+
     }
 
     (*tmp)->new = 0;
@@ -240,8 +232,7 @@ int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *e
      * 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.
      */
-    if (stat ((*tmp)->path, &sb) == 0 && !test_new_folder ((*tmp)->path))
-    {
+    if (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;
     }
@@ -274,9 +265,12 @@ int mutt_buffy_check (int force)
   DIR *dirp;
   char path[_POSIX_PATH_MAX];
   struct stat contex_sb;
-  time_t now, last1, last2;
+  time_t now, last1;
   CONTEXT *ctx;
+
 #ifdef USE_IMAP
+  time_t last2;
+
   /* update postponed count as well, on force */
   if (force != 0)
     mutt_update_num_postponed ();
@@ -290,7 +284,7 @@ int mutt_buffy_check (int force)
 #ifdef USE_IMAP
       && (now - ImapBuffyTime < ImapBuffyTimeout))
 #else
-      )
+    )
 #endif
     return BuffyCount;
 
@@ -309,20 +303,19 @@ int mutt_buffy_check (int force)
   if (!Context || Context->magic != M_IMAP)
 #endif
 #ifdef USE_POP
-  if (!Context || Context->magic != M_POP)
+    if (!Context || Context->magic != M_POP)
 #endif
 #ifdef USE_NNTP
-  if (!Context || Context->magic != M_NNTP)
+      if (!Context || Context->magic != M_NNTP)
 #endif
-  /* check device ID and serial number instead of comparing paths */
-  if (!Context || !Context->path || stat (Context->path, &contex_sb) != 0)
-  {
-    contex_sb.st_dev=0;
-    contex_sb.st_ino=0;
-  }
-  
-  for (tmp = Incoming; tmp; tmp = tmp->next)
-  {
+        /* check device ID and serial number instead of comparing paths */
+        if (!Context || !Context->path
+            || stat (Context->path, &contex_sb) != 0) {
+          contex_sb.st_dev = 0;
+          contex_sb.st_ino = 0;
+        }
+
+  for (tmp = Incoming; tmp; tmp = tmp->next) {
 #ifdef USE_IMAP
     if (mx_is_imap (tmp->path))
       tmp->magic = M_IMAP;
@@ -339,8 +332,7 @@ int mutt_buffy_check (int force)
     else
 #endif
     if (stat (tmp->path, &sb) != 0 || sb.st_size == 0 ||
-       (!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0))
-    {
+          (!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0)) {
       /* if the mailbox still doesn't exist, set the newly created flag to
        * be ready for when it does. */
       tmp->newly_created = 1;
@@ -353,25 +345,31 @@ int mutt_buffy_check (int force)
 
     /* check to see if the folder is the currently selected folder
      * before polling */
-    if (!Context || !Context->path ||
-         (
-           (0
+    if (!Context || !Context->path || ((0
 #ifdef USE_IMAP
-            || tmp->magic == M_IMAP
+                                        || tmp->magic == M_IMAP
 #endif
 #ifdef USE_POP
-            || tmp->magic == M_POP
+                                        || tmp->magic == M_POP
 #endif
 #ifdef USE_NNTP
-            || tmp->magic == M_NNTP
+                                        || tmp->magic == M_NNTP
 #endif
-           ) ? mutt_strcmp (tmp->path, Context->path) :
-               (sb.st_dev != contex_sb.st_dev || sb.st_ino != contex_sb.st_ino)
-         )
-       )
-    {
-      switch (tmp->magic)
-      {
+                                       )? mutt_strcmp (tmp->path,
+                                                       Context->path) : (sb.
+                                                                         st_dev
+                                                                         !=
+                                                                         contex_sb.
+                                                                         st_dev
+                                                                         ||
+                                                                         sb.
+                                                                         st_ino
+                                                                         !=
+                                                                         contex_sb.
+                                                                         st_ino)
+        )
+      ) {
+      switch (tmp->magic) {
       case M_MBOX:
       case M_MMDF:
         /* only check on force or $mail_check reached */
@@ -382,17 +380,19 @@ int mutt_buffy_check (int force)
               tmp->new = 1;
             }
 #ifdef BUFFY_SIZE
-            else
-            {
+            else {
               /* some other program has deleted mail from the folder */
               tmp->size = (long) sb.st_size;
             }
 #endif
-          } else if (SidebarWidth > 0 && option (OPTMBOXPANE) && 
-                    (STAT_CHECK || tmp->msgcount == 0)) {
+          }
+          else if (SidebarWidth > 0 && option (OPTMBOXPANE) &&
+                   (STAT_CHECK || tmp->msgcount == 0)) {
             /* sidebar visible */
             BuffyCount++;
-            if ((ctx = mx_open_mailbox (tmp->path, M_READONLY | M_QUIET | M_NOSORT, NULL)) != NULL) {
+            if ((ctx =
+                 mx_open_mailbox (tmp->path, M_READONLY | M_QUIET | M_NOSORT,
+                                  NULL)) != NULL) {
               tmp->msgcount = ctx->msgcount;
               tmp->new = ctx->new;
               tmp->msg_unread = ctx->new;       /* for sidebar, wtf? */
@@ -403,7 +403,8 @@ int mutt_buffy_check (int force)
           if (tmp->newly_created &&
               (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
             tmp->newly_created = 0;
-        } else if (tmp->new > 0)
+        }
+        else if (tmp->new > 0)
           BuffyCount++;
         break;
 
@@ -411,23 +412,20 @@ int mutt_buffy_check (int force)
         /* only check on force or $mail_check reached */
         if (force != 0 || (now - last1 >= BuffyTimeout)) {
           snprintf (path, sizeof (path), "%s/new", tmp->path);
-          if ((dirp = opendir (path)) == NULL)
-          {
+          if ((dirp = opendir (path)) == NULL) {
             tmp->magic = 0;
             break;
           }
           tmp->new = 0;
           tmp->msg_unread = 0;
           tmp->msgcount = 0;
-          while ((de = readdir (dirp)) != NULL)
-          {
+          while ((de = readdir (dirp)) != NULL) {
             char *p;
-            if (*de->d_name != '.' && 
-                (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
-            {
+
+            if (*de->d_name != '.' &&
+                (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) {
               /* one new and undeleted message is enough */
-              if (tmp->new == 0)
-              {
+              if (tmp->new == 0) {
                 BuffyCount++;
                 tmp->new = 1;
                 if (SidebarWidth == 0 || !option (OPTMBOXPANE))
@@ -441,20 +439,19 @@ int mutt_buffy_check (int force)
           }
           closedir (dirp);
 
-          if (SidebarWidth > 0 && option (OPTMBOXPANE))
-          {
+          if (SidebarWidth > 0 && option (OPTMBOXPANE)) {
             /* only count total mail if sidebar visible */
             snprintf (path, sizeof (path), "%s/cur", tmp->path);
-            if ((dirp = opendir (path)) == NULL)
-            {
+            if ((dirp = opendir (path)) == NULL) {
               tmp->magic = 0;
               break;
             }
             tmp->msg_flagged = 0;
-            while ((de = readdir (dirp)) != NULL)
-            {
+            while ((de = readdir (dirp)) != NULL) {
               char *p;
-              if (*de->d_name != '.' && (p = strstr (de->d_name, ":2,")) != NULL) {
+
+              if (*de->d_name != '.'
+                  && (p = strstr (de->d_name, ":2,")) != NULL) {
                 if (!strchr (p + 3, 'T'))
                   tmp->msgcount++;
                 if (strchr (p + 3, 'F'))
@@ -463,7 +460,8 @@ int mutt_buffy_check (int force)
             }
             closedir (dirp);
           }
-        } else if (tmp->new > 0)
+        }
+        else if (tmp->new > 0)
           /* keep current stats if !force and !$mail_check reached */
           BuffyCount++;
         break;
@@ -473,19 +471,17 @@ int mutt_buffy_check (int force)
         if (force != 0 || (now - last1 >= BuffyTimeout)) {
           if ((tmp->new = mh_buffy (tmp->path)) > 0)
             BuffyCount++;
-          if (SidebarWidth > 0 && option (OPTMBOXPANE))
-          {
+          if (SidebarWidth > 0 && option (OPTMBOXPANE)) {
             DIR *dp;
             struct dirent *de;
+
             if ((dp = opendir (path)) == NULL)
               break;
             tmp->new = 0;
             tmp->msgcount = 0;
             tmp->msg_unread = 0;
-            while ((de = readdir (dp)))
-            {
-              if (mh_valid_message (de->d_name))
-              {
+            while ((de = readdir (dp))) {
+              if (mh_valid_message (de->d_name)) {
                 tmp->msgcount++;
                 tmp->msg_unread++;
                 tmp->new++;
@@ -493,7 +489,8 @@ int mutt_buffy_check (int force)
             }
             closedir (dp);
           }
-        } else if (tmp->new > 0)
+        }
+        else if (tmp->new > 0)
           /* keep current stats if !force and !$mail_check reached */
           BuffyCount++;
         break;
@@ -511,7 +508,8 @@ int mutt_buffy_check (int force)
             tmp->new = 0;
             tmp->msg_unread = 0;
           }
-        } else if (tmp->new > 0)
+        }
+        else if (tmp->new > 0)
           /* keep current stats if !force and !$imap_mail_check reached */
           BuffyCount++;
         break;
@@ -530,10 +528,10 @@ int mutt_buffy_check (int force)
     }
 #ifdef BUFFY_SIZE
     else if (Context && Context->path)
-      tmp->size = (long) sb.st_size;	/* update the size */
+      tmp->size = (long) sb.st_size;    /* update the size */
 #endif
 
-    if (!tmp->new)
+    if (tmp->new <= 0)
       tmp->notified = 0;
     else if (!tmp->notified)
       BuffyNotify++;
@@ -560,37 +558,33 @@ int mutt_buffy_list (void)
   first = 1;
   buffylist[0] = 0;
   pos += strlen (strncat (buffylist, _("New mail in "), sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
-  for (tmp = Incoming; tmp; tmp = tmp->next)
-  {
+  for (tmp = Incoming; tmp; tmp = tmp->next) {
     /* Is there new mail in this mailbox? */
-    if (!tmp->new || (have_unnotified && tmp->notified))
+    if (tmp->new <= 0 || (have_unnotified && tmp->notified))
       continue;
 
     strfcpy (path, tmp->path, sizeof (path));
     mutt_pretty_mailbox (path);
-    
+
     if (!first && pos + strlen (path) >= COLS - 7)
       break;
-    
+
     if (!first)
-      pos += strlen (strncat(buffylist + pos, ", ", sizeof(buffylist)-1-pos)); /* __STRNCAT_CHECKED__ */
+      pos += strlen (strncat (buffylist + pos, ", ", sizeof (buffylist) - 1 - pos));    /* __STRNCAT_CHECKED__ */
 
     /* Prepend an asterisk to mailboxes not already notified */
-    if (!tmp->notified)
-    {
+    if (!tmp->notified) {
       /* pos += strlen (strncat(buffylist + pos, "*", sizeof(buffylist)-1-pos));  __STRNCAT_CHECKED__ */
       tmp->notified = 1;
       BuffyNotify--;
     }
-    pos += strlen (strncat(buffylist + pos, path, sizeof(buffylist)-1-pos)); /* __STRNCAT_CHECKED__ */
+    pos += strlen (strncat (buffylist + pos, path, sizeof (buffylist) - 1 - pos));      /* __STRNCAT_CHECKED__ */
     first = 0;
   }
-  if (!first && tmp)
-  {
-    strncat (buffylist + pos, ", ...", sizeof (buffylist) - 1 - pos); /* __STRNCAT_CHECKED__ */
+  if (!first && tmp) {
+    strncat (buffylist + pos, ", ...", sizeof (buffylist) - 1 - pos);   /* __STRNCAT_CHECKED__ */
   }
-  if (!first)
-  {
+  if (!first) {
     /* on new mail: redraw sidebar */
     draw_sidebar (CurrentMenu);
     mutt_message ("%s", buffylist);
@@ -605,8 +599,7 @@ int mutt_buffy_list (void)
 
 int mutt_buffy_notify (void)
 {
-  if (mutt_buffy_check (0) && BuffyNotify)
-  {
+  if (mutt_buffy_check (0) && BuffyNotify) {
     return (mutt_buffy_list ());
   }
   return (0);
@@ -624,8 +617,7 @@ void mutt_buffy (char *s, size_t slen)
   BUFFY *tmp = Incoming;
 
   mutt_expand_path (s, _POSIX_PATH_MAX);
-  switch (mutt_buffy_check (0))
-  {
+  switch (mutt_buffy_check (0)) {
   case 0:
 
     *s = '\0';
@@ -633,12 +625,11 @@ void mutt_buffy (char *s, size_t slen)
 
   case 1:
 
-    while (tmp && !tmp->new)
+    while (tmp && tmp->new <= 0)
       tmp = tmp->next;
-    if (!tmp)
-    {
+    if (!tmp) {
       *s = '\0';
-      mutt_buffy_check (1); /* buffy was wrong - resync things */
+      mutt_buffy_check (1);     /* buffy was wrong - resync things */
       break;
     }
     strfcpy (s, tmp->path, slen);
@@ -646,25 +637,22 @@ void mutt_buffy (char *s, size_t slen)
     break;
 
   default:
-    
+
     count = 0;
-    while (count < 3)
-    {
+    while (count < 3) {
       if (mutt_strcmp (s, tmp->path) == 0)
-	count++;
-      else if (count && tmp->new)
-	break;
+        count++;
+      else if (count && tmp->new > 0)
+        break;
       tmp = tmp->next;
-      if (!tmp)
-      {
-	tmp = Incoming;
-	count++;
+      if (!tmp) {
+        tmp = Incoming;
+        count++;
       }
     }
-    if (count >= 3)
-    {
+    if (count >= 3) {
       *s = '\0';
-      mutt_buffy_check (1); /* buffy was wrong - resync things */
+      mutt_buffy_check (1);     /* buffy was wrong - resync things */
       break;
     }
     strfcpy (s, tmp->path, slen);