-/*
+/*
+ * 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 "mutt.h"
#include "buffy.h"
-#include "mailbox.h"
#include "mx.h"
+#include "mh.h"
#include "sidebar.h"
#include "mutt_curses.h"
#include "imap.h"
#endif
+#include "lib/mem.h"
+#include "lib/intl.h"
+
#include <string.h>
#include <sys/stat.h>
#include <dirent.h>
* 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) */
+ strncpy (buffer + BUFSIZ, buffer, 5 + 2); /* 2 == 2 * safe_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 */
+ 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);
return 0;
}
}
/* 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);
}
BUFFY *mutt_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)
}
#endif
+/* func to free buffy for list_del() */
+static void buffy_free (void** p) {
+ FREE(&(*((BUFFY**) p))->path);
+ FREE(p);
+}
+
+int buffy_lookup (const char* path) {
+ int i = 0;
+ 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)
+ return (i);
+ }
+ return (-1);
+}
+
int mutt_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data,
BUFFER * err)
{
- BUFFY **tmp, *tmp1;
+ BUFFY* tmp;
char buf[_POSIX_PATH_MAX];
-
+ int i = 0;
#ifdef BUFFY_SIZE
struct stat sb;
#endif /* BUFFY_SIZE */
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;
- }
+ if (data == M_UNMAILBOXES && safe_strcmp (buf, "*") == 0) {
+ list_del (&Incoming, buffy_free);
return 0;
}
- mutt_expand_path (buf, sizeof (buf));
-
/* Skip empty tokens. */
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 (i >= 0) {
+ tmp = (BUFFY*) list_pop_idx (Incoming, i);
+ buffy_free (&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 = safe_calloc (1, sizeof (BUFFY));
+ tmp->path = safe_strdup (buf);
+ tmp->magic = 0;
+ list_push_back (&Incoming, tmp);
+ i = Incoming->length-1;
+ } else
+ tmp = (BUFFY*) Incoming->data[i];
- (*tmp)->new = 0;
- (*tmp)->notified = 1;
- (*tmp)->newly_created = 0;
+ 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)) {
+ 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;
+ tmp->size = (long) sb.st_size;
}
else
- (*tmp)->size = 0;
+ tmp->size = 0;
#endif /* BUFFY_SIZE */
}
return 0;
struct stat contex_sb;
time_t now, last1;
CONTEXT *ctx;
-
+ int i = 0, local = 0;
#ifdef USE_IMAP
time_t last2;
#endif
/* fastest return if there are no mailboxes */
- if (!Incoming)
+ if (list_empty(Incoming))
return 0;
now = time (NULL);
if (force == 0 && (now - BuffyTime < BuffyTimeout)
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;
- }
+ if ((!Context || 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) {
-#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->length; i++) {
+ tmp = (BUFFY*) Incoming->data[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;
+ tmp->magic = -1;
#ifdef BUFFY_SIZE
tmp->size = 0;
#endif
/* 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) :
+ safe_strcmp (tmp->path, Context->path))) {
switch (tmp->magic) {
case M_MBOX:
case M_MMDF:
break;
#endif
-#ifdef USE_POP
- case M_POP:
- break;
-#endif
-
-#ifdef USE_NNTP
- case M_NNTP:
- break;
-#endif
}
}
#ifdef BUFFY_SIZE
tmp->has_new = tmp->new > 0;
}
if (BuffyCount > 0 && force != 2)
- draw_sidebar (CurrentMenu);
+ sidebar_draw (CurrentMenu);
return (BuffyCount);
}
int pos;
int first;
int have_unnotified = BuffyNotify;
+ int i = 0;
if (option (OPTFORCEBUFFYCHECK))
mutt_buffy_check (1);
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) {
- /* Is there new mail in this mailbox? */
- if (tmp->new <= 0 || (have_unnotified && tmp->notified))
- continue;
-
- strfcpy (path, tmp->path, sizeof (path));
- mutt_pretty_mailbox (path);
-
- if (!first && pos + strlen (path) >= COLS - 7)
- break;
+ pos += safe_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];
+ /* Is there new mail in this mailbox? */
+ if (tmp->new <= 0 || (have_unnotified && tmp->notified))
+ continue;
+
+ strfcpy (path, tmp->path, sizeof (path));
+ mutt_pretty_mailbox (path);
+
+ if (!first && pos + safe_strlen (path) >= COLS - 7)
+ break;
- if (!first)
- pos += strlen (strncat (buffylist + pos, ", ", sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
+ if (!first)
+ pos += safe_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--;
+ /* Prepend an asterisk to mailboxes not already notified */
+ if (!tmp->notified) {
+ /* pos += safe_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__ */
+ first = 0;
}
- pos += strlen (strncat (buffylist + pos, path, sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
- first = 0;
}
- if (!first && tmp) {
+ if (!first && i < Incoming->length) {
strncat (buffylist + pos, ", ...", sizeof (buffylist) - 1 - pos); /* __STRNCAT_CHECKED__ */
}
if (!first) {
/* on new mail: redraw sidebar */
- draw_sidebar (CurrentMenu);
+ sidebar_draw (CurrentMenu);
mutt_message ("%s", buffylist);
return (1);
}
*/
void mutt_buffy (char *s, size_t slen)
{
- int count;
- BUFFY *tmp = Incoming;
+ int i = 0, c = 0;
- mutt_expand_path (s, _POSIX_PATH_MAX);
- switch (mutt_buffy_check (0)) {
- case 0:
+ if (list_empty(Incoming))
+ return;
+ mutt_expand_path (s, _POSIX_PATH_MAX);
+ if (mutt_buffy_check (0) == 0) {
*s = '\0';
- break;
-
- case 1:
-
- while (tmp && tmp->new <= 0)
- tmp = tmp->next;
- if (!tmp) {
- *s = '\0';
- mutt_buffy_check (1); /* buffy was wrong - resync things */
- break;
- }
- strfcpy (s, tmp->path, slen);
- mutt_pretty_mailbox (s);
- break;
-
- default:
+ return;
+ }
- count = 0;
- while (count < 3) {
- if (mutt_strcmp (s, tmp->path) == 0)
- count++;
- else if (count && tmp->new > 0)
- break;
- tmp = tmp->next;
- if (!tmp) {
- tmp = Incoming;
- count++;
- }
- }
- if (count >= 3) {
- *s = '\0';
- mutt_buffy_check (1); /* buffy was wrong - resync things */
- break;
- }
- strfcpy (s, tmp->path, slen);
+ 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 (c == i) {
+ *s = '\0';
+ /* something went wrong since we're here when mutt_buffy_check
+ * reported new mail */
+ mutt_buffy_check (0);
+ } else {
+ strfcpy (s, ((BUFFY*) Incoming->data[c])->path, slen);
mutt_pretty_mailbox (s);
- break;
}
}
projects / apps / madmutt.git / blobdiff