X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=buffy.c;h=7290fa64754515d1a6086503d45ceed02bc3b621;hp=1f49f9113554b6b05ab83319099838ea2472d0c3;hb=f997801a16ce4a8530cb30cddebfe6243cb3502d;hpb=b2a6a9673e124c222f921650a6f0025b64ab2145 diff --git a/buffy.c b/buffy.c index 1f49f91..7290fa6 100644 --- a/buffy.c +++ b/buffy.c @@ -51,7 +51,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 */ -int fseek_last_message (FILE * f) +static int fseek_last_message (FILE * f) { long int 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 */ -int test_last_status_new (FILE * f) +static int test_last_status_new (FILE * f) { HEADER *hdr; ENVELOPE *tmp_envelope; @@ -114,7 +114,7 @@ int test_last_status_new (FILE * f) return result; } -int test_new_folder (const char *path) +static int test_new_folder (const char *path) { FILE *f; int rc = 0; @@ -133,7 +133,7 @@ int test_new_folder (const char *path) return rc; } -BUFFY *mutt_find_mailbox (const char *path) +BUFFY *buffy_find_mailbox (const char *path) { struct stat sb; struct stat tmp_sb; @@ -152,7 +152,7 @@ BUFFY *mutt_find_mailbox (const char *path) return (NULL); } -void mutt_update_mailbox (BUFFY * b) +void buffy_update_mailbox (BUFFY * b) { struct stat sb; @@ -184,7 +184,7 @@ int buffy_lookup (const char* path) { return (-1); } -int mutt_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data, +int buffy_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data, BUFFER * err) { BUFFY* tmp; @@ -261,7 +261,7 @@ int mutt_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data, * 1 force all checks + update sidebar * 2 force all checks + _don't_ update sidebar */ -int mutt_buffy_check (int force) +int buffy_check (int force) { BUFFY *tmp; struct stat sb; @@ -271,7 +271,7 @@ int mutt_buffy_check (int force) struct stat contex_sb; time_t now, last1; CONTEXT *ctx; - int i = 0, local = 0; + int i = 0, local = 0, count = 0; #ifdef USE_IMAP time_t last2; @@ -303,7 +303,10 @@ int mutt_buffy_check (int force) BuffyCount = 0; BuffyNotify = 0; - if ((!Context || mx_is_local (Context->magic-1)) && stat (Context->path, &contex_sb) != 0) { + count = sidebar_need_count (); + + if (!Context || !Context->path || + (mx_is_local (Context->magic-1) && stat (Context->path, &contex_sb) != 0)) { /* check device ID and serial number instead of comparing paths */ contex_sb.st_dev = 0; contex_sb.st_ino = 0; @@ -334,7 +337,7 @@ int mutt_buffy_check (int force) case M_MMDF: /* only check on force or $mail_check reached */ if (force != 0 || (now - last1 >= BuffyTimeout)) { - if (SidebarWidth == 0 || !option (OPTMBOXPANE)) { + if (!count) { if (STAT_CHECK) { BuffyCount++; tmp->new = 1; @@ -346,12 +349,11 @@ int mutt_buffy_check (int force) } #endif } - else if (SidebarWidth > 0 && option (OPTMBOXPANE) && - (STAT_CHECK || tmp->msgcount == 0)) { + else if (STAT_CHECK || tmp->msgcount == 0) { /* sidebar visible */ BuffyCount++; if ((ctx = - mx_open_mailbox (tmp->path, M_READONLY | M_QUIET | M_NOSORT, + mx_open_mailbox (tmp->path, M_READONLY | M_QUIET | M_NOSORT | M_COUNT, NULL)) != NULL) { tmp->msgcount = ctx->msgcount; tmp->new = ctx->new; @@ -388,7 +390,7 @@ int mutt_buffy_check (int force) if (tmp->new == 0) { BuffyCount++; tmp->new = 1; - if (SidebarWidth == 0 || !option (OPTMBOXPANE)) + if (!count) /* if sidebar invisible -> done */ break; } @@ -399,7 +401,7 @@ int mutt_buffy_check (int force) } closedir (dirp); - if (SidebarWidth > 0 && option (OPTMBOXPANE)) { + if (count) { /* only count total mail if sidebar visible */ snprintf (path, sizeof (path), "%s/cur", tmp->path); if ((dirp = opendir (path)) == NULL) { @@ -431,7 +433,7 @@ 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 (count) { DIR *dp; struct dirent *de; @@ -493,7 +495,7 @@ int mutt_buffy_check (int force) return (BuffyCount); } -int mutt_buffy_list (void) +int buffy_list (void) { BUFFY *tmp; char path[_POSIX_PATH_MAX]; @@ -504,7 +506,7 @@ int mutt_buffy_list (void) int i = 0; if (option (OPTFORCEBUFFYCHECK)) - mutt_buffy_check (1); + buffy_check (1); pos = 0; first = 1; @@ -552,10 +554,10 @@ int mutt_buffy_list (void) return (0); } -int mutt_buffy_notify (void) +int buffy_notify (void) { - if (mutt_buffy_check (0) && BuffyNotify) { - return (mutt_buffy_list ()); + if (buffy_check (0) && BuffyNotify) { + return (buffy_list ()); } return (0); } @@ -566,31 +568,36 @@ int mutt_buffy_notify (void) * given a folder name, this routine gives the next incoming folder with new * new mail. */ -void mutt_buffy (char *s, size_t slen) +void buffy_next (char *s, size_t slen) { - int i = 0, c = 0; + int i = 0, c = 0, l = 0; if (list_empty(Incoming)) return; mutt_expand_path (s, _POSIX_PATH_MAX); - if (mutt_buffy_check (0) == 0) { + if (buffy_check (0) == 0) { *s = '\0'; return; } - i = buffy_lookup (s); - c = i == Incoming->length-1 ? 0 : i+1; - while (((BUFFY*) Incoming->data[c])->new <= 0) { - c = (c+1) % Incoming->length; - if (c == i) - break; /* tried all once */ + /* + * If buffy_lookup returns the index, + * or -1 if not found (-1..Incoming->length-1); + * plus one --> (0..Incoming->length). + * Modulo mapps it into the correct range. + */ + i = 1 + buffy_lookup (s); + for (l=0; l < Incoming->length; l++) { + c = (l+i) % Incoming->length; + if (((BUFFY*) Incoming->data[c])->new > 0) + break; } - if (c == i) { + if (l >= Incoming->length) { *s = '\0'; - /* something went wrong since we're here when mutt_buffy_check + /* something went wrong since we're here when buffy_check * reported new mail */ - mutt_buffy_check (0); + buffy_check (0); } else { strfcpy (s, ((BUFFY*) Incoming->data[c])->path, slen); mutt_pretty_mailbox (s);