-/*
+/*
+ * Copyright notice from original mutt:
* Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ *
+ * Parts were written/modified by:
+ * Rocco Rutte <pdmef@cs.tu-berlin.de>
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "mutt.h"
-#include "buffy.h"
-#include "mailbox.h"
-#include "mx.h"
-
-#include "mutt_curses.h"
-
-#ifdef USE_IMAP
-#include "imap.h"
-#endif
-
-#include <string.h>
-#include <sys/stat.h>
+#include <lib-lib/lib-lib.h>
#include <dirent.h>
#include <utime.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <stdio.h>
+#include <lib-ui/curses.h>
+#include <lib-ui/sidebar.h>
-static time_t BuffyTime = 0; /* last time we started checking for mail */
-time_t BuffyDoneTime = 0; /* last time we knew for sure how much mail there was. */
-static short BuffyCount = 0; /* how many boxes with new mail */
-static short BuffyNotify = 0; /* # of unnotified new boxes */
+#include <imap/imap.h>
-#ifdef BUFFY_SIZE
-
-/* Find the last message in the file.
- * upon success return 0. If no message found - return -1 */
-
-int fseek_last_message (FILE * f)
-{
- long int 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);
-
- /* Set `bytes_read' to the size of the last, probably partial, buffer; 0 <
- * `bytes_read' <= `BUFSIZ'. */
- bytes_read = pos % BUFSIZ;
- if (bytes_read == 0)
- bytes_read = BUFSIZ;
- /* Make `pos' a multiple of `BUFSIZ' (0 if the file is short), so that all
- * 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 * mutt_strlen(CRLF) */
- fseek (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 (!mutt_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;
- }
- bytes_read = BUFSIZ;
- }
+#include "mutt.h"
+#include "buffy.h"
+#include "mx.h"
+#include "mh.h"
- /* here we are at the beginning of the file */
- if (!mutt_strncmp ("From ", buffer, 5))
- {
- fseek (f, 0, 0);
- return (0);
- }
+static time_t BuffyTime = 0; /* last time we started checking for mail */
- return (-1);
-}
+static time_t ImapBuffyTime = 0; /* last time we started checking for mail */
+static short BuffyCount = 0; /* how many boxes with new mail */
+static short BuffyNotify = 0; /* # of unnotified new boxes */
-/* Return 1 if the last message is new */
-int test_last_status_new (FILE * f)
+static inline void buffy_delete(BUFFY** p)
{
- HEADER *hdr;
- ENVELOPE* tmp_envelope;
- int result = 0;
-
- if (fseek_last_message (f) == -1)
- return (0);
-
- hdr = mutt_new_header ();
- 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);
-
- return result;
+ p_delete(&(*p)->path);
+ p_delete(p);
}
-int test_new_folder (const char *path)
-{
- FILE *f;
- int rc = 0;
- int typ;
+DO_ARRAY_FUNCS(BUFFY, buffy, buffy_delete);
- typ = mx_get_magic (path);
+/* Return the index number of path in Incoming list */
+int buffy_lookup (const char* path) {
+ int i = 0;
- if (typ != M_MBOX && typ != M_MMDF)
- return 0;
+ if (!Incoming.len || !path || !*path)
+ return (-1);
- if ((f = fopen (path, "rb")))
- {
- rc = test_last_status_new (f);
- fclose (f);
+ for (i = 0; i < Incoming.len; i++) {
+ if (!m_strcmp(Incoming.arr[i]->path, path))
+ return (i);
}
- return rc;
-}
-
-BUFFY *mutt_find_mailbox (const char *path)
-{
- BUFFY *tmp = NULL;
- struct stat sb;
- struct stat tmp_sb;
-
- 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;
- }
- return tmp;
-}
-
-void mutt_update_mailbox (BUFFY * b)
-{
- struct stat sb;
-
- if (!b)
- return;
-
- if (stat (b->path, &sb) == 0)
- b->size = (long) sb.st_size;
- else
- b->size = 0;
- return;
+ return (-1);
}
-#endif
-int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *err)
+int buffy_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data,
+ BUFFER * err __attribute__ ((unused)))
{
- BUFFY **tmp,*tmp1;
+ BUFFY* tmp;
char buf[_POSIX_PATH_MAX];
-#ifdef BUFFY_SIZE
- struct stat sb;
-#endif /* BUFFY_SIZE */
+ int i = 0;
- while (MoreArgs (s))
- {
+ while (MoreArgs (s)) {
mutt_extract_token (path, s, 0);
- strfcpy (buf, path->data, sizeof (buf));
-
- if(data == M_UNMAILBOXES && mutt_strcmp(buf,"*") == 0)
- {
- for (tmp = &Incoming; *tmp;)
- {
- FREE (&((*tmp)->path));
- tmp1=(*tmp)->next;
- FREE (tmp);
- *tmp=tmp1;
- }
+ m_strcpy(buf, sizeof(buf), path->data);
+
+ if (data == M_UNMAILBOXES && !strcmp(buf, "*")) {
+ buffy_array_wipe(&Incoming);
return 0;
}
- mutt_expand_path (buf, sizeof (buf));
-
/* Skip empty tokens. */
- if(!*buf) continue;
+ if (!*buf)
+ continue;
- /* simple check to avoid duplicates */
- for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next))
- {
- if (mutt_strcmp (buf, (*tmp)->path) == 0)
- break;
- }
+ mutt_expand_path (buf, sizeof (buf));
+ i = buffy_lookup (buf);
- if(data == M_UNMAILBOXES)
- {
- if(*tmp)
- {
- FREE (&((*tmp)->path));
- tmp1=(*tmp)->next;
- FREE (tmp);
- *tmp=tmp1;
- }
+ if (data == M_UNMAILBOXES) {
+ tmp = buffy_array_take(&Incoming, i);
+ buffy_delete(&tmp);
continue;
}
- if (!*tmp)
- {
- *tmp = (BUFFY *) safe_calloc (1, sizeof (BUFFY));
- (*tmp)->path = safe_strdup (buf);
- (*tmp)->next = NULL;
- /* it is tempting to set magic right here */
- (*tmp)->magic = 0;
-
+ if (i < 0) {
+ tmp = p_new(BUFFY, 1);
+ tmp->path = m_strdup(buf);
+ tmp->magic = 0;
+ buffy_array_append(&Incoming, tmp);
+ i = Incoming.len-1;
+ } else {
+ tmp = Incoming.arr[i];
}
- (*tmp)->new = 0;
- (*tmp)->notified = 1;
- (*tmp)->newly_created = 0;
-
-#ifdef BUFFY_SIZE
- /* for buffy_size, it is important that if the folder is new (tested by
- * reading it), the size is set to 0 so that later when we check we see
- * that it increased . without buffy_size we probably don't care.
- */
- if (stat ((*tmp)->path, &sb) == 0 && !test_new_folder ((*tmp)->path))
- {
- /* some systems out there don't have an off_t type */
- (*tmp)->size = (long) sb.st_size;
- }
- else
- (*tmp)->size = 0;
-#endif /* BUFFY_SIZE */
+ tmp->new = 0;
+ tmp->notified = 1;
+ tmp->newly_created = 0;
+
}
return 0;
}
-#ifdef BUFFY_SIZE
-/* people use buffy_size on systems where modified time attributes are BADLY
- * broken. Ignore them.
- */
-#define STAT_CHECK (sb.st_size > tmp->size)
-#else
#define STAT_CHECK (sb.st_mtime > sb.st_atime || (tmp->newly_created && sb.st_ctime == sb.st_mtime && sb.st_ctime == sb.st_atime))
-#endif /* BUFFY_SIZE */
-int mutt_buffy_check (int force)
+/* values for force:
+ * 0 don't force any checks + update sidebar
+ * 1 force all checks + update sidebar
+ * 2 don't force any checks + _don't_ update sidebar
+ */
+int buffy_check (int force)
{
BUFFY *tmp;
struct stat sb;
DIR *dirp;
char path[_POSIX_PATH_MAX];
struct stat contex_sb;
- time_t t;
+ time_t now, last1;
CONTEXT *ctx;
-#ifdef USE_IMAP
+ int i = 0;
+ int local = 0, count = 0;
+ time_t last2;
+
/* update postponed count as well, on force */
- if (force)
+ if (force == 1)
mutt_update_num_postponed ();
-#endif
/* fastest return if there are no mailboxes */
- if (!Incoming)
+ if (!Incoming.len)
return 0;
- t = time (NULL);
- if (!force && (t - BuffyTime < BuffyTimeout))
+ now = time (NULL);
+ if (force == 0 && (now - BuffyTime < BuffyTimeout)
+ && (now - ImapBuffyTime < ImapBuffyTimeout))
return BuffyCount;
-
- BuffyTime = t;
+
+ last1 = BuffyTime;
+ if (force == 1 || now - BuffyTime >= BuffyTimeout)
+ BuffyTime = now;
+ last2 = ImapBuffyTime;
+ if (force == 1 || now - ImapBuffyTime >= ImapBuffyTimeout)
+ ImapBuffyTime = now;
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 (tmp = Incoming; tmp; tmp = tmp->next)
- {
- if ( tmp->new == 1 )
- tmp->has_new = 1;
- tmp->new = 0;
-#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))
- {
+ for (i = 0; i < Incoming.len; i++) {
+ tmp = Incoming.arr[i];
+ 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;
-#ifdef BUFFY_SIZE
- tmp->size = 0;
-#endif
+ tmp->magic = -1;
continue;
}
/* 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)
- )
- )
- {
- switch (tmp->magic)
- {
+ if (!Context || !Context->path || (local ? (sb.st_dev != contex_sb.st_dev ||
+ sb.st_ino != contex_sb.st_ino) :
+ m_strcmp(tmp->path, Context->path))) {
+ switch (tmp->magic) {
case M_MBOX:
case M_MMDF:
-
- {
- if (STAT_CHECK || tmp->msgcount == 0)
- {
- BUFFY b = *tmp;
- int msgcount = 0;
- int msg_unread = 0;
- BuffyCount++;
- /* parse the mailbox, to see how much mail there is */
- ctx = mx_open_mailbox( tmp->path, M_READONLY | M_QUIET | M_NOSORT,
- NULL);
- if(ctx)
- {
- msgcount = ctx->msgcount;
- msg_unread = ctx->unread;
- mx_close_mailbox(ctx, 0);
- }
- *tmp = b;
- tmp->msgcount = msgcount;
- tmp->msg_unread = msg_unread;
- if(STAT_CHECK)
- tmp->has_new = tmp->new = 1;
- }
-#ifdef BUFFY_SIZE
- else
- {
- /* some other program has deleted mail from the folder */
- tmp->size = (long) sb.st_size;
- }
-#endif
- if (tmp->newly_created &&
- (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
- tmp->newly_created = 0;
- }
- break;
+ /* only check on force or $mail_check reached */
+ if (force == 1 || (now - last1 >= BuffyTimeout)) {
+ if (!count) {
+ if (STAT_CHECK) {
+ BuffyCount++;
+ tmp->new = 1;
+ }
+ }
+ else if (STAT_CHECK || tmp->msgcount == 0) {
+ /* sidebar visible */
+ BuffyCount++;
+ if ((ctx =
+ mx_open_mailbox (tmp->path, M_READONLY | M_QUIET | M_NOSORT | M_COUNT,
+ NULL)) != NULL) {
+ tmp->msgcount = ctx->msgcount;
+ tmp->new = ctx->new;
+ tmp->msg_unread = ctx->new; /* for sidebar, wtf? */
+ tmp->msg_flagged = ctx->flagged;
+ mx_close_mailbox (ctx, 0);
+ }
+ }
+ if (tmp->newly_created &&
+ (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
+ tmp->newly_created = 0;
+ }
+ else if (tmp->new > 0)
+ BuffyCount++;
+ break;
case M_MAILDIR:
-
- snprintf (path, sizeof (path), "%s/new", tmp->path);
- if ((dirp = opendir (path)) == NULL)
- {
- tmp->magic = 0;
- break;
- }
- tmp->msgcount = 0;
- tmp->msg_unread = 0;
- tmp->msg_flagged = 0;
- while ((de = readdir (dirp)) != NULL)
- {
- char *p;
- if (*de->d_name != '.' &&
- (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
- {
- /* one new and undeleted message is enough */
- if (tmp->new != 1)
- {
- BuffyCount++;
- tmp->has_new = tmp->new = 1;
- }
- tmp->msgcount++;
- tmp->msg_unread++;
- }
- }
- closedir (dirp);
-#if 1
- /* I commented this out because it led to an infite "New mail in ..." loop,
- * and when looking at the code, the check seems to be overly eager.
- * -- ak
- */
- snprintf (path, sizeof (path), "%s/cur", tmp->path);
- if ((dirp = opendir (path)) == NULL)
- {
- tmp->magic = 0;
- break;
- }
- while ((de = readdir (dirp)) != NULL)
- {
- char *p;
- if (*de->d_name != '.' &&
- (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
- {
- /* one new and undeleted message is enough */
- BuffyCount++;
-#if 0
- /* we're checking for read and not new mail;
- * seems like copy'n'paste error
- */
- tmp->has_new = tmp->new = 1;
-#endif
- tmp->msgcount++;
- }
- }
- closedir (dirp);
-#endif
- break;
+ /* only check on force or $mail_check reached */
+ if (force == 1 || (now - last1 >= BuffyTimeout)) {
+ snprintf (path, sizeof (path), "%s/new", tmp->path);
+ if ((dirp = opendir (path)) == NULL) {
+ tmp->magic = 0;
+ break;
+ }
+ tmp->new = 0;
+ tmp->msg_unread = 0;
+ tmp->msgcount = 0;
+ while ((de = readdir (dirp)) != NULL) {
+ char *p;
+
+ if (*de->d_name != '.' &&
+ (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) {
+ /* one new and undeleted message is enough */
+ if (tmp->new == 0) {
+ BuffyCount++;
+ if (!count) {
+ /* if sidebar invisible -> done */
+ tmp->new = 1;
+ break;
+ }
+ }
+ tmp->msgcount++;
+ tmp->msg_unread++;
+ tmp->new++;
+ }
+ }
+ closedir (dirp);
+
+ if (count) {
+ /* only count total mail if sidebar visible */
+ snprintf (path, sizeof (path), "%s/cur", tmp->path);
+ if ((dirp = opendir (path)) == NULL) {
+ tmp->magic = 0;
+ break;
+ }
+ tmp->msg_flagged = 0;
+ while ((de = readdir (dirp)) != NULL) {
+ char *p;
+
+ if (*de->d_name != '.'
+ && (p = strstr (de->d_name, ":2,")) != NULL) {
+ if (!strchr (p + 3, 'T'))
+ tmp->msgcount++;
+ if (strchr (p + 3, 'F'))
+ tmp->msg_flagged++;
+ }
+ }
+ closedir (dirp);
+ }
+ }
+ else if (tmp->new > 0)
+ /* keep current stats if !force and !$mail_check reached */
+ BuffyCount++;
+ break;
case M_MH:
- {
- DIR *dp;
- struct dirent *de;
- if ((tmp->new = mh_buffy (tmp->path)) > 0)
- BuffyCount++;
-
- if ((dp = opendir (path)) == NULL)
- break;
- tmp->msgcount = 0;
- while ((de = readdir (dp)))
- {
- if (mh_valid_message (de->d_name))
- {
- tmp->msgcount++;
- tmp->has_new = tmp->new = 1;
+ /* only check on force or $mail_check reached */
+ if (force == 1 || (now - last1 >= BuffyTimeout)) {
+ if ((tmp->new = mh_buffy (tmp->path)) > 0)
+ BuffyCount++;
+ if (count) {
+ DIR *dp;
+
+ if ((dp = opendir (path)) == NULL)
+ break;
+ tmp->new = 0;
+ tmp->msgcount = 0;
+ tmp->msg_unread = 0;
+ while ((de = readdir (dp))) {
+ if (mh_valid_message (de->d_name)) {
+ tmp->msgcount++;
+ tmp->msg_unread++;
+ tmp->new++;
+ }
+ }
+ closedir (dp);
+ }
}
- }
- closedir (dp);
- }
- break;
-
-#ifdef USE_IMAP
+ else if (tmp->new > 0)
+ /* keep current stats if !force and !$mail_check reached */
+ BuffyCount++;
+ break;
+
case M_IMAP:
- tmp->msgcount = imap_mailbox_check(tmp->path, 0);
- if ((tmp->new = imap_mailbox_check (tmp->path, 1)) > 0) {
- BuffyCount++;
- }
- else
- tmp->new = 0;
-
- break;
-#endif
-
-#ifdef USE_POP
- case M_POP:
- break;
-#endif
-
-#ifdef USE_NNTP
- case M_NNTP:
- break;
-#endif
+ /* only check on force or $imap_mail_check reached */
+ 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);
+ if (tmp->new > 0)
+ BuffyCount++;
+ 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 */
+ BuffyCount++;
+ break;
+
}
}
-#ifdef BUFFY_SIZE
- else if (Context && Context->path)
- tmp->size = (long) sb.st_size; /* update the size */
-#endif
- if (!tmp->new)
+ if (tmp->new <= 0)
tmp->notified = 0;
else if (!tmp->notified)
BuffyNotify++;
+ tmp->has_new = tmp->new > 0;
}
-
- BuffyDoneTime = BuffyTime;
+ if (BuffyCount > 0 && force != 2)
+ sidebar_draw ();
return (BuffyCount);
}
-int mutt_buffy_list (void)
+int buffy_list (void)
{
BUFFY *tmp;
char path[_POSIX_PATH_MAX];
char buffylist[160];
int pos;
int first;
-
int have_unnotified = BuffyNotify;
-
+ int i = 0;
+
pos = 0;
first = 1;
buffylist[0] = 0;
- pos += strlen (strncat (buffylist, _("New mail in "), sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
- for (tmp = Incoming; tmp; tmp = tmp->next)
- {
+ pos += m_strlen(strncat (buffylist, _("New mail in "), sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
+ for (i = 0; i < Incoming.len; i++) {
+ tmp = Incoming.arr[i];
/* Is there new mail in this mailbox? */
- if (!tmp->new || (have_unnotified && tmp->notified))
+ 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 + strlen (path) >= COLS - 7)
+
+ if (!first && pos + m_strlen(path) >= COLS - 7)
break;
-
+
if (!first)
- pos += strlen (strncat(buffylist + pos, ", ", sizeof(buffylist)-1-pos)); /* __STRNCAT_CHECKED__ */
-
- /* Prepend an asterisk to mailboxes not already notified */
- if (!tmp->notified)
- {
- /* pos += strlen (strncat(buffylist + pos, "*", sizeof(buffylist)-1-pos)); __STRNCAT_CHECKED__ */
- tmp->notified = 1;
- BuffyNotify--;
- }
- pos += strlen (strncat(buffylist + pos, path, sizeof(buffylist)-1-pos)); /* __STRNCAT_CHECKED__ */
+ pos += m_strlen(strncat (buffylist + pos, ", ", sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
+
+ tmp->notified = 1;
+ BuffyNotify--;
+
+ pos += m_strlen(strncat (buffylist + pos, path, sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
first = 0;
}
- if (!first && tmp)
- {
- strncat (buffylist + pos, ", ...", sizeof (buffylist) - 1 - pos); /* __STRNCAT_CHECKED__ */
+
+ if (!first && i < Incoming.len) {
+ strncat (buffylist + pos, ", ...", sizeof (buffylist) - 1 - pos); /* __STRNCAT_CHECKED__ */
}
- if (!first)
- {
+ if (!first) {
+ /* on new mail: redraw sidebar */
+ sidebar_draw ();
mutt_message ("%s", buffylist);
return (1);
}
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);
}
/*
- * 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 mutt_buffy (char *s, size_t slen)
+void buffy_next (char *s, size_t slen)
{
- int count;
- BUFFY *tmp = Incoming;
+ int l = 0;
+ int c = 0, i = 0;
mutt_expand_path (s, _POSIX_PATH_MAX);
- switch (mutt_buffy_check (0))
- {
- case 0:
-
- *s = '\0';
- break;
-
- case 1:
-
- while (tmp && !tmp->new)
- tmp = tmp->next;
- if (!tmp)
- {
+ if (!buffy_check (0)) {
*s = '\0';
- mutt_buffy_check (1); /* buffy was wrong - resync things */
- break;
- }
- strfcpy (s, tmp->path, slen);
- mutt_pretty_mailbox (s);
- break;
-
- default:
-
- count = 0;
- while (count < 3)
- {
- if (mutt_strcmp (s, tmp->path) == 0)
- count++;
- else if (count && tmp->new)
- break;
- tmp = tmp->next;
- if (!tmp)
- {
- tmp = Incoming;
- count++;
- }
+ return;
}
- if (count >= 3)
- {
- *s = '\0';
- mutt_buffy_check (1); /* buffy was wrong - resync things */
+
+ /*
+ * buffy_lookup returns the index,
+ * or -1 if not found (-1..Incoming.len-1);
+ * plus one --> (0..Incoming.len).
+ * Modulo mapps it into the correct range.
+ */
+ i = 1 + buffy_lookup (s);
+ for (l = 0; l < Incoming.len; l++) {
+ c = (l+i) % Incoming.len;
+
+ if (m_strcmp(Incoming.arr[c]->path, s) && Incoming.arr[c]->new > 0)
break;
- }
- strfcpy (s, tmp->path, slen);
+ }
+ if (l >= Incoming.len) {
+ *s = '\0';
+ /* something went wrong since we're here when buffy_check
+ * reported new mail */
+ buffy_check (1);
+ } else {
+ m_strcpy(s, slen, Incoming.arr[c]->path);
mutt_pretty_mailbox (s);
- break;
}
}
projects / apps / madmutt.git / blobdiff