X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=buffy.c;h=4a307833f8aecfcec5f0085ce0b0de19f02465c4;hp=126cf8c7f583d53036e30b5d84464de68a3deab8;hb=fdb93a08e305b8755260144807e4d45106a9cb9f;hpb=5f6b586de5a46f2359a4fc392fd89f1716d847a3 diff --git a/buffy.c b/buffy.c index 126cf8c..4a30783 100644 --- a/buffy.c +++ b/buffy.c @@ -14,21 +14,20 @@ # include "config.h" #endif +#include +#include +#include + +#include + +#include + #include "mutt.h" #include "buffy.h" -#include "buffer.h" #include "mx.h" #include "mh.h" #include "sidebar.h" -#include "mutt_curses.h" - -#ifdef USE_IMAP -#include "imap.h" -#endif - -#include "lib/mem.h" -#include "lib/intl.h" #include #include @@ -41,9 +40,7 @@ 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 */ @@ -59,7 +56,7 @@ static int fseeko_last_message (FILE * f) int bytes_read; int i; /* Index into `buffer' for scanning. */ - memset (buffer, 0, sizeof (buffer)); + p_clear(buffer, 1); fseeko (f, 0, SEEK_END); pos = ftello (f); @@ -72,13 +69,13 @@ static int fseeko_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 * str_len(CRLF) */ + 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 (!str_ncmp (buffer + i, "\n\nFrom ", str_len ("\n\nFrom "))) { /* found it - go to the beginning of the From */ + if (!m_strncmp(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; } @@ -86,7 +83,7 @@ static int fseeko_last_message (FILE * f) } /* here we are at the beginning of the file */ - if (!str_ncmp ("From ", buffer, 5)) { + if (!m_strncmp("From ", buffer, 5)) { fseeko (f, 0, 0); return (0); } @@ -104,13 +101,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,23 +167,23 @@ void buffy_update_mailbox (BUFFY * b) /* func to free buffy for list_del() */ static void buffy_free (BUFFY** p) { - mem_free(&(*p)->path); - mem_free(p); + p_delete(&(*p)->path); + p_delete(p); } int buffy_lookup (const char* path) { - int i = 0; + unsigned int i = 0; 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]; @@ -197,9 +194,9 @@ int buffy_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data, while (MoreArgs (s)) { mutt_extract_token (path, s, 0); - strfcpy (buf, path->data, sizeof (buf)); + 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; } @@ -220,8 +217,8 @@ int buffy_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data, } if (i < 0) { - tmp = mem_calloc (1, sizeof (BUFFY)); - tmp->path = str_dup (buf); + tmp = p_new(BUFFY, 1); + tmp->path = m_strdup(buf); tmp->magic = 0; list_push_back (&Incoming, tmp); i = Incoming->length-1; @@ -260,7 +257,7 @@ int buffy_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 buffy_check (int force) { @@ -272,35 +269,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 + unsigned int i = 0; + int local = 0, count = 0; time_t last2; /* update postponed count as well, on force */ - if (force != 0) + 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 != 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; @@ -332,12 +322,12 @@ 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: /* only check on force or $mail_check reached */ - if (force != 0 || (now - last1 >= BuffyTimeout)) { + if (force == 1 || (now - last1 >= BuffyTimeout)) { if (!count) { if (STAT_CHECK) { BuffyCount++; @@ -373,7 +363,7 @@ int 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; @@ -390,10 +380,11 @@ int buffy_check (int force) /* one new and undeleted message is enough */ if (tmp->new == 0) { BuffyCount++; - tmp->new = 1; - if (!count) + if (!count) { /* if sidebar invisible -> done */ + tmp->new = 1; break; + } } tmp->msgcount++; tmp->msg_unread++; @@ -431,12 +422,11 @@ int 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 (count) { DIR *dp; - struct dirent *de; if ((dp = opendir (path)) == NULL) break; @@ -458,10 +448,9 @@ int buffy_check (int force) BuffyCount++; break; -#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); tmp->new = imap_mailbox_check (tmp->path, 1); tmp->msg_unread = imap_mailbox_check (tmp->path, 2); @@ -476,7 +465,6 @@ int buffy_check (int force) /* keep current stats if !force and !$imap_mail_check reached */ BuffyCount++; break; -#endif } } @@ -504,12 +492,12 @@ int buffy_list (void) int pos; int first; int have_unnotified = BuffyNotify; - int i = 0; + unsigned int i = 0; pos = 0; first = 1; buffylist[0] = 0; - pos += str_len (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]; @@ -517,22 +505,22 @@ int buffy_list (void) if (tmp->new <= 0 || (have_unnotified && tmp->notified)) continue; - strfcpy (path, tmp->path, sizeof (path)); + m_strcpy(path, sizeof(path), tmp->path); mutt_pretty_mailbox (path); - if (!first && pos + str_len (path) >= COLS - 7) + if (!first && pos + m_strlen(path) >= COLS - 7) break; if (!first) - pos += str_len (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 += str_len (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 += str_len (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; } } @@ -568,7 +556,8 @@ int buffy_notify (void) */ void buffy_next (char *s, size_t slen) { - int i = 0, c = 0, l = 0; + unsigned int l = 0; + int c = 0, i = 0; if (list_empty(Incoming)) return; @@ -588,7 +577,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; } @@ -598,7 +587,7 @@ void buffy_next (char *s, size_t slen) * reported new mail */ buffy_check (0); } else { - strfcpy (s, ((BUFFY*) Incoming->data[c])->path, slen); + m_strcpy(s, slen, ((BUFFY*)Incoming->data[c])->path); mutt_pretty_mailbox (s); } }