X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=buffy.c;h=dfadbe8538dc61dbf6767bdffe9309d8dae31bb0;hp=96ae2fa0f88f8eeabf034cc30e40ea69fb853d81;hb=bd5c6e968ae1f29f5819d1e39ec104cc632ad545;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1 diff --git a/buffy.c b/buffy.c index 96ae2fa..dfadbe8 100644 --- a/buffy.c +++ b/buffy.c @@ -10,41 +10,23 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include +#include +#include + +#include +#include -#include -#include -#include +#include #include "mutt.h" #include "buffy.h" #include "mx.h" #include "mh.h" -#include "sidebar.h" - -#include "mutt_curses.h" - -#ifdef USE_IMAP -#include "imap.h" -#endif - - -#include -#include -#include -#include -#include -#include - -#include 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 */ @@ -105,13 +87,13 @@ static int test_last_status_new (FILE * f) if (fseeko_last_message (f) == -1) return (0); - hdr = mutt_new_header (); + hdr = header_new(); tmp_envelope = mutt_read_rfc822_header (f, hdr, 0, 0); if (!(hdr->read || hdr->old)) result = 1; - mutt_free_envelope (&tmp_envelope); - mutt_free_header (&hdr); + envelope_delete(&tmp_envelope); + header_delete(&hdr); return result; } @@ -170,7 +152,7 @@ void buffy_update_mailbox (BUFFY * b) #endif /* func to free buffy for list_del() */ -static void buffy_free (BUFFY** p) { +static inline void buffy_free (BUFFY** p) { p_delete(&(*p)->path); p_delete(p); } @@ -180,14 +162,14 @@ int buffy_lookup (const char* path) { if (list_empty(Incoming) || !path || !*path) return (-1); for (i = 0; i < Incoming->length; i++) { - if (str_eq (((BUFFY*) Incoming->data[i])->path, path) ) + if (!m_strcmp(((BUFFY*)Incoming->data[i])->path, path) ) return (i); } return (-1); } int buffy_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data, - BUFFER * err) + BUFFER * err __attribute__ ((unused))) { BUFFY* tmp; char buf[_POSIX_PATH_MAX]; @@ -200,7 +182,7 @@ int buffy_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data, mutt_extract_token (path, s, 0); m_strcpy(buf, sizeof(buf), path->data); - if (data == M_UNMAILBOXES && str_eq (buf, "*")) { + if (data == M_UNMAILBOXES && !strcmp(buf, "*")) { list_del (&Incoming, (list_del_t*) buffy_free); return 0; } @@ -273,35 +255,28 @@ int buffy_check (int force) struct stat contex_sb; time_t now, last1; CONTEXT *ctx; - int i = 0, local = 0, count = 0; -#ifdef USE_IMAP + int i = 0; + int local = 0, count = 0; time_t last2; /* update postponed count as well, on force */ if (force == 1) mutt_update_num_postponed (); -#endif /* fastest return if there are no mailboxes */ if (list_empty(Incoming)) return 0; now = time (NULL); if (force == 0 && (now - BuffyTime < BuffyTimeout) -#ifdef USE_IMAP && (now - ImapBuffyTime < ImapBuffyTimeout)) -#else - ) -#endif return BuffyCount; last1 = BuffyTime; if (force == 1 || now - BuffyTime >= BuffyTimeout) BuffyTime = now; -#ifdef USE_IMAP last2 = ImapBuffyTime; if (force == 1 || now - ImapBuffyTime >= ImapBuffyTimeout) ImapBuffyTime = now; -#endif BuffyCount = 0; BuffyNotify = 0; @@ -333,7 +308,7 @@ int buffy_check (int force) * before polling */ 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))) { + m_strcmp(tmp->path, Context->path))) { switch (tmp->magic) { case M_MBOX: case M_MMDF: @@ -438,7 +413,6 @@ int buffy_check (int force) BuffyCount++; if (count) { DIR *dp; - struct dirent *de; if ((dp = opendir (path)) == NULL) break; @@ -460,7 +434,6 @@ int buffy_check (int force) BuffyCount++; break; -#ifdef USE_IMAP case M_IMAP: /* only check on force or $imap_mail_check reached */ if (force == 1 || (now - last2 >= ImapBuffyTimeout)) { @@ -478,7 +451,6 @@ int buffy_check (int force) /* keep current stats if !force and !$imap_mail_check reached */ BuffyCount++; break; -#endif } } @@ -514,7 +486,7 @@ int buffy_list (void) 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]; + tmp = Incoming->data[i]; /* Is there new mail in this mailbox? */ if (tmp->new <= 0 || (have_unnotified && tmp->notified)) continue; @@ -528,12 +500,9 @@ int buffy_list (void) if (!first) pos += m_strlen(strncat (buffylist + pos, ", ", sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */ - /* Prepend an asterisk to mailboxes not already notified */ - if (!tmp->notified) { - /* pos += m_strlen(strncat(buffylist + pos, "*", sizeof(buffylist)-1-pos)); __STRNCAT_CHECKED__ */ - tmp->notified = 1; - BuffyNotify--; - } + tmp->notified = 1; + BuffyNotify--; + pos += m_strlen(strncat (buffylist + pos, path, sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */ first = 0; } @@ -563,23 +532,21 @@ int buffy_notify (void) } /* - * mutt_buffy() -- incoming folders completion routine + * buffy_next() -- incoming folders completion routine * * given a folder name, this routine gives the next incoming folder with new * new mail. */ void buffy_next (char *s, size_t slen) { - int i = 0, c = 0, l = 0; - - if (list_empty(Incoming)) - return; + int l = 0; + int c = 0, i = 0; mutt_expand_path (s, _POSIX_PATH_MAX); - if (buffy_check (0) == 0) { - *s = '\0'; - return; - } + if (!buffy_check (0)) { + *s = '\0'; + return; + } /* * If buffy_lookup returns the index, @@ -590,7 +557,7 @@ void buffy_next (char *s, size_t slen) 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)) && + if ((!Context || !Context->path || m_strcmp(((BUFFY*) Incoming->data[c])->path, Context->path)) && ((BUFFY*) Incoming->data[c])->new > 0) break; }