X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=buffy.c;h=99a746d2690dbbcc7e38926562502c465d94920c;hp=9c861b07dee2f4687a59999e2be86493609601a4;hb=21595f98b7c8132f99abb9fee60ecdce31fc980f;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b diff --git a/buffy.c b/buffy.c index 9c861b0..99a746d 100644 --- a/buffy.c +++ b/buffy.c @@ -14,10 +14,14 @@ # include "config.h" #endif +#include +#include +#include + #include "mutt.h" #include "buffy.h" -#include "mailbox.h" #include "mx.h" +#include "mh.h" #include "sidebar.h" #include "mutt_curses.h" @@ -26,8 +30,6 @@ #include "imap.h" #endif -#include "lib/mem.h" -#include "lib/intl.h" #include #include @@ -51,16 +53,16 @@ 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 fseeko_last_message (FILE * f) { - long int pos; + LOFF_T pos; char buffer[BUFSIZ + 9]; /* 7 for "\n\nFrom " */ int bytes_read; int i; /* Index into `buffer' for scanning. */ - memset (buffer, 0, sizeof (buffer)); - fseek (f, 0, SEEK_END); - pos = ftell (f); + p_clear(buffer, 1); + fseeko (f, 0, SEEK_END); + pos = ftello (f); /* Set `bytes_read' to the size of the last, probably partial, buffer; 0 < * `bytes_read' <= `BUFSIZ'. */ @@ -71,22 +73,22 @@ int fseek_last_message (FILE * f) * reads will be on block boundaries, which might increase efficiency. */ 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 * safe_strlen(CRLF) */ - fseek (f, pos, SEEK_SET); + strncpy (buffer + BUFSIZ, buffer, 5 + 2); /* 2 == 2 * m_strlen(CRLF) */ + fseeko (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 (!safe_strncmp (buffer + i, "\n\nFrom ", safe_strlen ("\n\nFrom "))) { /* found it - go to the beginning of the From */ - fseek (f, pos + i + 2, SEEK_SET); + if (!str_ncmp (buffer + i, "\n\nFrom ", m_strlen("\n\nFrom "))) { /* found it - go to the beginning of the From */ + fseeko (f, pos + i + 2, SEEK_SET); return 0; } bytes_read = BUFSIZ; } /* here we are at the beginning of the file */ - if (!safe_strncmp ("From ", buffer, 5)) { - fseek (f, 0, 0); + if (!str_ncmp ("From ", buffer, 5)) { + fseeko (f, 0, 0); return (0); } @@ -94,13 +96,13 @@ 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; int result = 0; - if (fseek_last_message (f) == -1) + if (fseeko_last_message (f) == -1) return (0); hdr = mutt_new_header (); @@ -114,7 +116,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 +135,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 +154,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; @@ -168,9 +170,9 @@ void mutt_update_mailbox (BUFFY * b) #endif /* func to free buffy for list_del() */ -static void buffy_free (void** p) { - FREE(&(*((BUFFY**) p))->path); - FREE(p); +static void buffy_free (BUFFY** p) { + p_delete(&(*p)->path); + p_delete(p); } int buffy_lookup (const char* path) { @@ -178,13 +180,13 @@ int buffy_lookup (const char* path) { if (list_empty(Incoming) || !path || !*path) return (-1); for (i = 0; i < Incoming->length; i++) { - if (safe_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; @@ -198,8 +200,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 && safe_strcmp (buf, "*") == 0) { - list_del (&Incoming, buffy_free); + if (data == M_UNMAILBOXES && str_eq (buf, "*")) { + list_del (&Incoming, (list_del_t*) buffy_free); return 0; } @@ -219,8 +221,8 @@ int mutt_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data, } if (i < 0) { - tmp = safe_calloc (1, sizeof (BUFFY)); - tmp->path = safe_strdup (buf); + tmp = p_new(BUFFY, 1); + tmp->path = m_strdup(buf); tmp->magic = 0; list_push_back (&Incoming, tmp); i = Incoming->length-1; @@ -259,9 +261,9 @@ int mutt_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data, /* 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 + * 2 don't force any checks + _don't_ update sidebar */ -int mutt_buffy_check (int force) +int buffy_check (int force) { BUFFY *tmp; struct stat sb; @@ -271,12 +273,12 @@ 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; /* update postponed count as well, on force */ - if (force != 0) + if (force == 1) mutt_update_num_postponed (); #endif @@ -293,55 +295,34 @@ int mutt_buffy_check (int force) return BuffyCount; last1 = BuffyTime; - if (force != 0 || now - BuffyTime >= BuffyTimeout) + if (force == 1 || now - BuffyTime >= BuffyTimeout) BuffyTime = now; #ifdef USE_IMAP last2 = ImapBuffyTime; - if (force != 0 || now - ImapBuffyTime >= ImapBuffyTimeout) + if (force == 1 || now - ImapBuffyTime >= ImapBuffyTimeout) ImapBuffyTime = now; #endif 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 @@ -350,36 +331,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 - )? safe_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 (force == 1 || (now - last1 >= BuffyTimeout)) { + if (!count) { if (STAT_CHECK) { BuffyCount++; tmp->new = 1; @@ -391,12 +351,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; @@ -415,7 +374,7 @@ int mutt_buffy_check (int force) case M_MAILDIR: /* only check on force or $mail_check reached */ - if (force != 0 || (now - last1 >= BuffyTimeout)) { + if (force == 1 || (now - last1 >= BuffyTimeout)) { snprintf (path, sizeof (path), "%s/new", tmp->path); if ((dirp = opendir (path)) == NULL) { tmp->magic = 0; @@ -432,10 +391,11 @@ int mutt_buffy_check (int force) /* one new and undeleted message is enough */ if (tmp->new == 0) { BuffyCount++; - tmp->new = 1; - if (SidebarWidth == 0 || !option (OPTMBOXPANE)) + if (!count) { /* if sidebar invisible -> done */ + tmp->new = 1; break; + } } tmp->msgcount++; tmp->msg_unread++; @@ -444,7 +404,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) { @@ -473,10 +433,10 @@ int mutt_buffy_check (int force) case M_MH: /* only check on force or $mail_check reached */ - if (force != 0 || (now - last1 >= BuffyTimeout)) { + if (force == 1 || (now - last1 >= BuffyTimeout)) { if ((tmp->new = mh_buffy (tmp->path)) > 0) BuffyCount++; - if (SidebarWidth > 0 && option (OPTMBOXPANE)) { + if (count) { DIR *dp; struct dirent *de; @@ -503,16 +463,16 @@ int mutt_buffy_check (int force) #ifdef USE_IMAP case M_IMAP: /* only check on force or $imap_mail_check reached */ - if (force != 0 || (now - last2 >= ImapBuffyTimeout)) { + if (force == 1 || (now - last2 >= ImapBuffyTimeout)) { tmp->msgcount = imap_mailbox_check (tmp->path, 0); - if ((tmp->new = imap_mailbox_check (tmp->path, 1)) > 0) { + tmp->new = imap_mailbox_check (tmp->path, 1); + tmp->msg_unread = imap_mailbox_check (tmp->path, 2); + if (tmp->new > 0) BuffyCount++; - tmp->msg_unread = tmp->new; /* for sidebar; wtf? */ - } - else { + else tmp->new = 0; + if (tmp->msg_unread < 0) tmp->msg_unread = 0; - } } else if (tmp->new > 0) /* keep current stats if !force and !$imap_mail_check reached */ @@ -520,15 +480,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 @@ -547,7 +498,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]; @@ -557,13 +508,10 @@ int mutt_buffy_list (void) int have_unnotified = BuffyNotify; int i = 0; - if (option (OPTFORCEBUFFYCHECK)) - mutt_buffy_check (1); - pos = 0; first = 1; buffylist[0] = 0; - pos += safe_strlen (strncat (buffylist, _("New mail in "), sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */ + pos += m_strlen(strncat (buffylist, _("New mail in "), sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */ if (Incoming) { for (i = 0; i < Incoming->length; i++) { tmp = (BUFFY*) Incoming->data[i]; @@ -574,19 +522,19 @@ int mutt_buffy_list (void) strfcpy (path, tmp->path, sizeof (path)); mutt_pretty_mailbox (path); - if (!first && pos + safe_strlen (path) >= COLS - 7) + if (!first && pos + m_strlen(path) >= COLS - 7) break; if (!first) - pos += safe_strlen (strncat (buffylist + pos, ", ", sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */ + pos += m_strlen(strncat (buffylist + pos, ", ", sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */ /* Prepend an asterisk to mailboxes not already notified */ if (!tmp->notified) { - /* pos += safe_strlen (strncat(buffylist + pos, "*", sizeof(buffylist)-1-pos)); __STRNCAT_CHECKED__ */ + /* pos += m_strlen(strncat(buffylist + pos, "*", sizeof(buffylist)-1-pos)); __STRNCAT_CHECKED__ */ tmp->notified = 1; BuffyNotify--; } - pos += safe_strlen (strncat (buffylist + pos, path, sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */ + pos += m_strlen(strncat (buffylist + pos, path, sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */ first = 0; } } @@ -606,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); } @@ -620,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);