X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=buffy.c;h=db7d964f90831d8456ab7cd4f86e5a88b69cb14c;hp=34010dec271639c3307ba11e667b1f0f99a80ad3;hb=01a3f4d932ddfc7f4a58f820d343f4a6f3b0f824;hpb=66beea5cc3cb7a98d270c5b6efdf815a60aded94 diff --git a/buffy.c b/buffy.c index 34010de..db7d964 100644 --- a/buffy.c +++ b/buffy.c @@ -1,19 +1,13 @@ -/* +/* + * Copyright notice from original mutt: * Copyright (C) 1996-2000 Michael R. Elkins - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * + * Parts were written/modified by: + * Rocco Rutte + * + * This file is part of mutt-ng, see http://www.muttng.org/. + * It's licensed under the GNU General Public License, + * please see the file GPL in the top level source directory. */ #if HAVE_CONFIG_H @@ -24,6 +18,7 @@ #include "buffy.h" #include "mailbox.h" #include "mx.h" +#include "sidebar.h" #include "mutt_curses.h" @@ -40,10 +35,13 @@ #include -static time_t BuffyTime = 0; /* last time we started checking for mail */ -time_t BuffyDoneTime = 0; /* last time we knew for sure how much mail there was. */ -static short BuffyCount = 0; /* how many boxes with new mail */ -static short BuffyNotify = 0; /* # of unnotified new boxes */ +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 */ #ifdef BUFFY_SIZE @@ -53,11 +51,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); @@ -68,26 +66,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); } @@ -99,7 +94,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) @@ -110,7 +105,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; @@ -127,8 +122,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); } @@ -141,14 +135,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; @@ -169,27 +162,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; } @@ -197,35 +189,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; @@ -237,8 +226,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; } @@ -258,6 +246,11 @@ int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *e #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 */ +/* values for force: + * 0 don't force any checks + update sidebar + * 1 force all checks + update sidebar + * 2 force all checks + _don't_ update sidebar + */ int mutt_buffy_check (int force) { BUFFY *tmp; @@ -266,22 +259,37 @@ int mutt_buffy_check (int force) DIR *dirp; char path[_POSIX_PATH_MAX]; struct stat contex_sb; - time_t t; + time_t now, last1; CONTEXT *ctx; + #ifdef USE_IMAP + time_t last2; + /* update postponed count as well, on force */ - if (force) + if (force != 0) mutt_update_num_postponed (); #endif /* fastest return if there are no mailboxes */ if (!Incoming) return 0; - t = time (NULL); - if (!force && (t - BuffyTime < BuffyTimeout)) + now = time (NULL); + if (force == 0 && (now - BuffyTime < BuffyTimeout) +#ifdef USE_IMAP + && (now - ImapBuffyTime < ImapBuffyTimeout)) +#else + ) +#endif return BuffyCount; - - BuffyTime = t; + + last1 = BuffyTime; + if (force != 0 || now - BuffyTime >= BuffyTimeout) + BuffyTime = now; +#ifdef USE_IMAP + last2 = ImapBuffyTime; + if (force != 0 || now - ImapBuffyTime >= ImapBuffyTimeout) + ImapBuffyTime = now; +#endif BuffyCount = 0; BuffyNotify = 0; @@ -289,24 +297,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) - { - if ( tmp->new == 1 ) - tmp->has_new = 1; - tmp->new = 0; + /* 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; @@ -323,8 +326,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; @@ -337,179 +339,200 @@ 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: - - { - if (STAT_CHECK || tmp->msgcount == 0) - { - BUFFY b = *tmp; - int msgcount = 0; - int msg_unread = 0; - BuffyCount++; - /* parse the mailbox, to see how much mail there is */ - ctx = mx_open_mailbox( tmp->path, M_READONLY | M_QUIET | M_NOSORT, - NULL); - if(ctx) - { - msgcount = ctx->msgcount; - msg_unread = ctx->unread; - mx_close_mailbox(ctx, 0); - } - *tmp = b; - tmp->msgcount = msgcount; - tmp->msg_unread = msg_unread; - if(STAT_CHECK) - tmp->has_new = tmp->new = 1; - } + /* only check on force or $mail_check reached */ + if (force != 0 || (now - last1 >= BuffyTimeout)) { + if (SidebarWidth == 0 || !option (OPTMBOXPANE)) { + if (STAT_CHECK) { + BuffyCount++; + tmp->new = 1; + } #ifdef BUFFY_SIZE - else - { - /* some other program has deleted mail from the folder */ - tmp->size = (long) sb.st_size; - } + else { + /* 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)) - tmp->newly_created = 0; - } - break; + } + 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) { + tmp->msgcount = ctx->msgcount; + tmp->new = ctx->new; + tmp->msg_unread = ctx->new; /* for sidebar, wtf? */ + tmp->msg_flagged = ctx->flagged; + mx_close_mailbox (ctx, 0); + } + } + 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) + BuffyCount++; + break; case M_MAILDIR: - - snprintf (path, sizeof (path), "%s/new", tmp->path); - if ((dirp = opendir (path)) == NULL) - { - tmp->magic = 0; - break; - } - tmp->msgcount = 0; - tmp->msg_unread = 0; - while ((de = readdir (dirp)) != NULL) - { - char *p; - if (*de->d_name != '.' && - (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) - { - /* one new and undeleted message is enough */ - if (tmp->new != 1) - { - BuffyCount++; - tmp->has_new = tmp->new = 1; - } - tmp->msgcount++; - tmp->msg_unread++; - } - } - closedir (dirp); -#if 1 - /* I commented this out because it led to an infite "New mail in ..." loop, - * and when looking at the code, the check seems to be overly eager. - * -- ak - */ - snprintf (path, sizeof (path), "%s/cur", tmp->path); - if ((dirp = opendir (path)) == NULL) - { - tmp->magic = 0; - break; - } - while ((de = readdir (dirp)) != NULL) - { - char *p; - if (*de->d_name != '.' && - (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) - { - /* one new and undeleted message is enough */ -#if 0 - BuffyCount++; - /* we're checking for read and not new mail; - * seems like copy'n'paste error - */ - tmp->has_new = tmp->new = 1; -#endif - tmp->msgcount++; - } - } - closedir (dirp); -#endif - break; + /* 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) { + tmp->magic = 0; + break; + } + tmp->new = 0; + tmp->msg_unread = 0; + tmp->msgcount = 0; + while ((de = readdir (dirp)) != NULL) { + char *p; + + 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) { + BuffyCount++; + tmp->new = 1; + if (SidebarWidth == 0 || !option (OPTMBOXPANE)) + /* if sidebar invisible -> done */ + break; + } + tmp->msgcount++; + tmp->msg_unread++; + tmp->new++; + } + } + closedir (dirp); + + 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) { + tmp->magic = 0; + break; + } + tmp->msg_flagged = 0; + while ((de = readdir (dirp)) != NULL) { + char *p; + + if (*de->d_name != '.' + && (p = strstr (de->d_name, ":2,")) != NULL) { + if (!strchr (p + 3, 'T')) + tmp->msgcount++; + if (strchr (p + 3, 'F')) + tmp->msg_flagged++; + } + } + closedir (dirp); + } + } + else if (tmp->new > 0) + /* keep current stats if !force and !$mail_check reached */ + BuffyCount++; + break; case M_MH: - { - DIR *dp; - struct dirent *de; - if ((tmp->new = mh_buffy (tmp->path)) > 0) - BuffyCount++; - - if ((dp = opendir (path)) == NULL) - break; - tmp->msgcount = 0; - while ((de = readdir (dp))) - { - if (mh_valid_message (de->d_name)) - { - tmp->msgcount++; - tmp->has_new = tmp->new = 1; + /* only check on force or $mail_check reached */ + if (force != 0 || (now - last1 >= BuffyTimeout)) { + if ((tmp->new = mh_buffy (tmp->path)) > 0) + BuffyCount++; + 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)) { + tmp->msgcount++; + tmp->msg_unread++; + tmp->new++; + } + } + closedir (dp); + } } - } - closedir (dp); - } - break; - + else if (tmp->new > 0) + /* keep current stats if !force and !$mail_check reached */ + BuffyCount++; + break; + #ifdef USE_IMAP case M_IMAP: - tmp->msgcount = imap_mailbox_check(tmp->path, 0); - if ((tmp->new = imap_mailbox_check (tmp->path, 1)) > 0) { - BuffyCount++; - } - else - tmp->new = 0; - - break; + /* only check on force or $imap_mail_check reached */ + if (force != 0 || (now - last2 >= ImapBuffyTimeout)) { + tmp->msgcount = imap_mailbox_check (tmp->path, 0); + if ((tmp->new = imap_mailbox_check (tmp->path, 1)) > 0) { + BuffyCount++; + tmp->msg_unread = tmp->new; /* for sidebar; wtf? */ + } + else { + tmp->new = 0; + tmp->msg_unread = 0; + } + } + else if (tmp->new > 0) + /* keep current stats if !force and !$imap_mail_check reached */ + BuffyCount++; + break; #endif #ifdef USE_POP case M_POP: - break; + break; #endif #ifdef USE_NNTP case M_NNTP: - break; + break; #endif } } #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++; + tmp->has_new = tmp->new > 0; } - - BuffyDoneTime = BuffyTime; + if (BuffyCount > 0 && force != 2) + draw_sidebar (CurrentMenu); return (BuffyCount); } @@ -520,44 +543,44 @@ int mutt_buffy_list (void) char buffylist[160]; int pos; int first; - int have_unnotified = BuffyNotify; - + + if (option (OPTFORCEBUFFYCHECK)) + mutt_buffy_check (1); + pos = 0; 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); return (1); } @@ -570,8 +593,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); @@ -589,8 +611,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'; @@ -598,12 +619,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); @@ -611,25 +631,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);