* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
+#include <dirent.h>
+#include <utime.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/sidebar.h>
+
+#include <imap/imap.h>
#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 <string.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <utime.h>
-#include <ctype.h>
-#include <unistd.h>
-
-#include <stdio.h>
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 */
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);
* 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;
}
}
/* 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);
}
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;
}
#endif
/* func to free buffy for list_del() */
-static void buffy_free (BUFFY** p) {
- mem_free(&(*p)->path);
- mem_free(p);
+static inline void buffy_free (BUFFY** p) {
+ p_delete(&(*p)->path);
+ p_delete(p);
}
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];
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;
}
}
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;
/* 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)
{
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 != 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;
* 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++;
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;
/* 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++;
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;
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);
/* keep current stats if !force and !$imap_mail_check reached */
BuffyCount++;
break;
-#endif
}
}
tmp->has_new = tmp->new > 0;
}
if (BuffyCount > 0 && force != 2)
- sidebar_draw (CurrentMenu);
+ sidebar_draw ();
return (BuffyCount);
}
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];
+ tmp = 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));
+ 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__ */
- tmp->notified = 1;
- BuffyNotify--;
- }
- pos += str_len (strncat (buffylist + pos, path, 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) {
/* on new mail: redraw sidebar */
- sidebar_draw (CurrentMenu);
+ sidebar_draw ();
mutt_message ("%s", buffylist);
return (1);
}
}
/*
- * 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,
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;
}
* 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);
}
}
projects / apps / madmutt.git / blobdiff