X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=buffy.c;h=4ede93b11b322c5ea36a292244f5d243fc9958dd;hp=c1dadeb5d5aec1613e7b7a1dfeca5910863311ee;hb=f13f60f17a117aab113c206c7b75d90f2c25d490;hpb=68d3f8c8e978c7acfcd115d9a3e895cf0fc4f71e diff --git a/buffy.c b/buffy.c index c1dadeb..4ede93b 100644 --- a/buffy.c +++ b/buffy.c @@ -16,8 +16,8 @@ #include "mutt.h" #include "buffy.h" -#include "mailbox.h" #include "mx.h" +#include "mh.h" #include "sidebar.h" #include "mutt_curses.h" @@ -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 " */ @@ -77,7 +77,7 @@ int fseek_last_message (FILE * 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 */ + if (!safe_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; } @@ -85,7 +85,7 @@ int fseek_last_message (FILE * f) } /* here we are at the beginning of the file */ - if (!mutt_strncmp ("From ", buffer, 5)) { + if (!safe_strncmp ("From ", buffer, 5)) { fseek (f, 0, 0); return (0); } @@ -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,24 +133,26 @@ int test_new_folder (const char *path) return rc; } -BUFFY *mutt_find_mailbox (const char *path) +BUFFY *buffy_find_mailbox (const char *path) { - BUFFY *tmp = NULL; struct stat sb; struct stat tmp_sb; + int i = 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) - break; + if (!list_empty(Incoming)) { + for (i = 0; i < Incoming->length; i++) { + if (stat (Incoming->data[i], &tmp_sb) == 0 && + sb.st_dev == tmp_sb.st_dev && sb.st_ino == tmp_sb.st_ino) + return ((BUFFY*) Incoming->data[i]); + } } - return tmp; + return (NULL); } -void mutt_update_mailbox (BUFFY * b) +void buffy_update_mailbox (BUFFY * b) { struct stat sb; @@ -166,8 +168,8 @@ void mutt_update_mailbox (BUFFY * b) #endif /* func to free buffy for list_del() */ -static void buffy_free (void** p) { - FREE(&(*((BUFFY**) p))->path); +static void buffy_free (BUFFY** p) { + FREE(&(*p)->path); FREE(p); } @@ -176,13 +178,13 @@ int buffy_lookup (const char* path) { if (list_empty(Incoming) || !path || !*path) return (-1); for (i = 0; i < Incoming->length; i++) { - if (mutt_strcmp (((BUFFY*) Incoming->data[i])->path, path) == 0) + if (str_eq (((BUFFY*) Incoming->data[i])->path, path) ) return (i); } 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; @@ -196,8 +198,8 @@ int mutt_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data, mutt_extract_token (path, s, 0); strfcpy (buf, path->data, sizeof (buf)); - if (data == M_UNMAILBOXES && mutt_strcmp (buf, "*") == 0) { - list_del (&Incoming, buffy_free); + if (data == M_UNMAILBOXES && str_eq (buf, "*") == 0) { + list_del (&Incoming, (list_del_t*) buffy_free); return 0; } @@ -259,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; @@ -269,7 +271,7 @@ int mutt_buffy_check (int force) struct stat contex_sb; time_t now, last1; CONTEXT *ctx; - int i = 0; + int i = 0, local = 0, count = 0; #ifdef USE_IMAP time_t last2; @@ -301,45 +303,24 @@ int mutt_buffy_check (int force) BuffyCount = 0; BuffyNotify = 0; -#ifdef USE_IMAP - if (!Context || Context->magic != M_IMAP) -#endif -#ifdef USE_POP - if (!Context || Context->magic != M_POP) -#endif -#ifdef USE_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; - } + 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; + } for (i = 0; i < Incoming->length; i++) { tmp = (BUFFY*) Incoming->data[i]; -#ifdef USE_IMAP - if (mx_is_imap (tmp->path)) - tmp->magic = M_IMAP; - else -#endif -#ifdef USE_POP - if (mx_is_pop (tmp->path)) - tmp->magic = M_POP; - else -#endif -#ifdef USE_NNTP - if ((tmp->magic == M_NNTP) || mx_is_nntp (tmp->path)) - tmp->magic = M_NNTP; - else -#endif - if (stat (tmp->path, &sb) != 0 || sb.st_size == 0 || - (!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0)) { + tmp->magic = mx_get_magic (tmp->path); + local = mx_is_local (tmp->magic-1); + if ((tmp->magic <= 0 || local) && (stat (tmp->path, &sb) != 0 || sb.st_size == 0)) { /* if the mailbox still doesn't exist, set the newly created flag to * be ready for when it does. */ tmp->newly_created = 1; - tmp->magic = 0; + tmp->magic = -1; #ifdef BUFFY_SIZE tmp->size = 0; #endif @@ -348,36 +329,15 @@ int mutt_buffy_check (int force) /* check to see if the folder is the currently selected folder * before polling */ - if (!Context || !Context->path || ((0 -#ifdef USE_IMAP - || tmp->magic == M_IMAP -#endif -#ifdef USE_POP - || tmp->magic == M_POP -#endif -#ifdef USE_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) - ) - ) { + if (!Context || !Context->path || (local ? (sb.st_dev != contex_sb.st_dev || + sb.st_ino != contex_sb.st_ino) : + !str_eq (tmp->path, Context->path))) { switch (tmp->magic) { case M_MBOX: 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; @@ -389,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; @@ -431,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; } @@ -442,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) { @@ -474,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; @@ -518,15 +477,6 @@ int mutt_buffy_check (int force) break; #endif -#ifdef USE_POP - case M_POP: - break; -#endif - -#ifdef USE_NNTP - case M_NNTP: - break; -#endif } } #ifdef BUFFY_SIZE @@ -545,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]; @@ -556,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; @@ -604,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); } @@ -618,31 +568,37 @@ 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 ((!Context || !Context->path || !str_eq (((BUFFY*) Incoming->data[c])->path, Context->path)) && + ((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);