#include "mutt.h"
#include "buffy.h"
+#include "buffer.h"
#include "mx.h"
#include "mh.h"
#include "sidebar.h"
/* 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 fseek_last_message (FILE * f)
{
long int pos;
char buffer[BUFSIZ + 9]; /* 7 for "\n\nFrom " */
* 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) */
+ strncpy (buffer + BUFSIZ, buffer, 5 + 2); /* 2 == 2 * str_len(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 (!safe_strncmp (buffer + i, "\n\nFrom ", safe_strlen ("\n\nFrom "))) { /* found it - go to the beginning of the From */
+ if (!str_ncmp (buffer + i, "\n\nFrom ", str_len ("\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 (!safe_strncmp ("From ", buffer, 5)) {
+ if (!str_ncmp ("From ", buffer, 5)) {
fseek (f, 0, 0);
return (0);
}
}
/* 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;
return result;
}
-int test_new_folder (const char *path)
+static int test_new_folder (const char *path)
{
FILE *f;
int rc = 0;
return rc;
}
-BUFFY *mutt_find_mailbox (const char *path)
+BUFFY *buffy_find_mailbox (const char *path)
{
struct stat sb;
struct stat tmp_sb;
return (NULL);
}
-void mutt_update_mailbox (BUFFY * b)
+void buffy_update_mailbox (BUFFY * b)
{
struct stat sb;
#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) {
+ mem_free(&(*p)->path);
+ mem_free(p);
}
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;
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, "*") == 0) {
+ list_del (&Incoming, (list_del_t*) buffy_free);
return 0;
}
}
if (i < 0) {
- tmp = safe_calloc (1, sizeof (BUFFY));
- tmp->path = safe_strdup (buf);
+ tmp = mem_calloc (1, sizeof (BUFFY));
+ tmp->path = str_dup (buf);
tmp->magic = 0;
list_push_back (&Incoming, tmp);
i = Incoming->length-1;
* 1 force all checks + update sidebar
* 2 force all checks + _don't_ update sidebar
*/
-int mutt_buffy_check (int force)
+int buffy_check (int force)
{
BUFFY *tmp;
struct stat sb;
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;
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_get_magic (tmp->path) == M_IMAP)
- tmp->magic = M_IMAP;
- else
-#endif
-#ifdef USE_POP
- if (mx_get_magic (tmp->path) == M_IMAP)
- tmp->magic = M_POP;
- else
-#endif
-#ifdef USE_NNTP
- if (mx_get_magic (tmp->path) == M_NNTP)
- 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
/* 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 (!count) {
if (STAT_CHECK) {
BuffyCount++;
tmp->new = 1;
}
#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;
if (tmp->new == 0) {
BuffyCount++;
tmp->new = 1;
- if (SidebarWidth == 0 || !option (OPTMBOXPANE))
+ if (!count)
/* if sidebar invisible -> done */
break;
}
}
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) {
if (force != 0 || (now - last1 >= BuffyTimeout)) {
if ((tmp->new = mh_buffy (tmp->path)) > 0)
BuffyCount++;
- if (SidebarWidth > 0 && option (OPTMBOXPANE)) {
+ if (count) {
DIR *dp;
struct dirent *de;
break;
#endif
-#ifdef USE_POP
- case M_POP:
- break;
-#endif
-
-#ifdef USE_NNTP
- case M_NNTP:
- break;
-#endif
}
}
#ifdef BUFFY_SIZE
return (BuffyCount);
}
-int mutt_buffy_list (void)
+int buffy_list (void)
{
BUFFY *tmp;
char path[_POSIX_PATH_MAX];
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 += str_len (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];
strfcpy (path, tmp->path, sizeof (path));
mutt_pretty_mailbox (path);
- if (!first && pos + safe_strlen (path) >= COLS - 7)
+ if (!first && pos + str_len (path) >= COLS - 7)
break;
if (!first)
- pos += safe_strlen (strncat (buffylist + pos, ", ", sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
+ pos += str_len (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 += str_len (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 += str_len (strncat (buffylist + pos, path, sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
first = 0;
}
}
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);
}
* 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);
projects / apps / madmutt.git / blobdiff