projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge OPS that do not need to be split anymore.
[apps/madmutt.git]
/
buffy.c
diff --git
a/buffy.c
b/buffy.c
index
99a746d
..
4018c5f
100644
(file)
--- a/
buffy.c
+++ b/
buffy.c
@@
-10,41
+10,23
@@
* please see the file GPL in the top level source directory.
*/
* 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 <lib-lib/mem.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/macros.h>
+#include <imap/imap.h>
#include "mutt.h"
#include "buffy.h"
#include "mx.h"
#include "mh.h"
#include "mutt.h"
#include "buffy.h"
#include "mx.h"
#include "mh.h"
-#include "sidebar.h"
-
-#include "mutt_curses.h"
-
-#ifdef USE_IMAP
-#include "imap.h"
-#endif
-
-
-#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 */
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 */
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 */
static short BuffyCount = 0; /* how many boxes with new mail */
static short BuffyNotify = 0; /* # of unnotified new boxes */
@@
-79,7
+61,7
@@
static int fseeko_last_message (FILE * f)
if (bytes_read == -1)
return -1;
for (i = bytes_read; --i >= 0;)
if (bytes_read == -1)
return -1;
for (i = bytes_read; --i >= 0;)
- if (!
str_ncmp
(buffer + i, "\n\nFrom ", m_strlen("\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;
}
fseeko (f, pos + i + 2, SEEK_SET);
return 0;
}
@@
-87,7
+69,7
@@
static int fseeko_last_message (FILE * f)
}
/* here we are at the beginning of the file */
}
/* 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);
}
fseeko (f, 0, 0);
return (0);
}
@@
-105,13
+87,13
@@
static int test_last_status_new (FILE * f)
if (fseeko_last_message (f) == -1)
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;
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;
}
return result;
}
@@
-170,7
+152,7
@@
void buffy_update_mailbox (BUFFY * b)
#endif
/* func to free buffy for list_del() */
#endif
/* func to free buffy for list_del() */
-static void buffy_free (BUFFY** p) {
+static
inline
void buffy_free (BUFFY** p) {
p_delete(&(*p)->path);
p_delete(p);
}
p_delete(&(*p)->path);
p_delete(p);
}
@@
-180,14
+162,14
@@
int buffy_lookup (const char* path) {
if (list_empty(Incoming) || !path || !*path)
return (-1);
for (i = 0; i < Incoming->length; i++) {
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,
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];
{
BUFFY* tmp;
char buf[_POSIX_PATH_MAX];
@@
-198,9
+180,9
@@
int buffy_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data,
while (MoreArgs (s)) {
mutt_extract_token (path, s, 0);
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;
}
list_del (&Incoming, (list_del_t*) buffy_free);
return 0;
}
@@
-273,35
+255,28
@@
int buffy_check (int force)
struct stat contex_sb;
time_t now, last1;
CONTEXT *ctx;
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 == 1)
mutt_update_num_postponed ();
time_t last2;
/* update postponed count as well, on force */
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)
/* 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))
&& (now - ImapBuffyTime < ImapBuffyTimeout))
-#else
- )
-#endif
return BuffyCount;
last1 = BuffyTime;
if (force == 1 || now - BuffyTime >= BuffyTimeout)
BuffyTime = now;
return BuffyCount;
last1 = BuffyTime;
if (force == 1 || now - BuffyTime >= BuffyTimeout)
BuffyTime = now;
-#ifdef USE_IMAP
last2 = ImapBuffyTime;
if (force == 1 || now - ImapBuffyTime >= ImapBuffyTimeout)
ImapBuffyTime = now;
last2 = ImapBuffyTime;
if (force == 1 || now - ImapBuffyTime >= ImapBuffyTimeout)
ImapBuffyTime = now;
-#endif
BuffyCount = 0;
BuffyNotify = 0;
BuffyCount = 0;
BuffyNotify = 0;
@@
-333,7
+308,7
@@
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) :
* 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:
switch (tmp->magic) {
case M_MBOX:
case M_MMDF:
@@
-438,7
+413,6
@@
int buffy_check (int force)
BuffyCount++;
if (count) {
DIR *dp;
BuffyCount++;
if (count) {
DIR *dp;
- struct dirent *de;
if ((dp = opendir (path)) == NULL)
break;
if ((dp = opendir (path)) == NULL)
break;
@@
-460,7
+434,6
@@
int buffy_check (int force)
BuffyCount++;
break;
BuffyCount++;
break;
-#ifdef USE_IMAP
case M_IMAP:
/* only check on force or $imap_mail_check reached */
if (force == 1 || (now - last2 >= ImapBuffyTimeout)) {
case M_IMAP:
/* only check on force or $imap_mail_check reached */
if (force == 1 || (now - last2 >= ImapBuffyTimeout)) {
@@
-478,7
+451,6
@@
int buffy_check (int force)
/* keep current stats if !force and !$imap_mail_check reached */
BuffyCount++;
break;
/* keep current stats if !force and !$imap_mail_check reached */
BuffyCount++;
break;
-#endif
}
}
}
}
@@
-494,7
+466,7
@@
int buffy_check (int force)
tmp->has_new = tmp->new > 0;
}
if (BuffyCount > 0 && force != 2)
tmp->has_new = tmp->new > 0;
}
if (BuffyCount > 0 && force != 2)
- sidebar_draw (
CurrentMenu
);
+ sidebar_draw ();
return (BuffyCount);
}
return (BuffyCount);
}
@@
-514,12
+486,12
@@
int buffy_list (void)
pos += m_strlen(strncat (buffylist, _("New mail in "), sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
if (Incoming) {
for (i = 0; i < Incoming->length; i++) {
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;
/* 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 + m_strlen(path) >= COLS - 7)
mutt_pretty_mailbox (path);
if (!first && pos + m_strlen(path) >= COLS - 7)
@@
-528,12
+500,9
@@
int buffy_list (void)
if (!first)
pos += m_strlen(strncat (buffylist + pos, ", ", sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
if (!first)
pos += m_strlen(strncat (buffylist + pos, ", ", sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
- /* Prepend an asterisk to mailboxes not already notified */
- if (!tmp->notified) {
- /* pos += m_strlen(strncat(buffylist + pos, "*", sizeof(buffylist)-1-pos)); __STRNCAT_CHECKED__ */
- tmp->notified = 1;
- BuffyNotify--;
- }
+ tmp->notified = 1;
+ BuffyNotify--;
+
pos += m_strlen(strncat (buffylist + pos, path, sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
first = 0;
}
pos += m_strlen(strncat (buffylist + pos, path, sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
first = 0;
}
@@
-543,7
+512,7
@@
int buffy_list (void)
}
if (!first) {
/* on new mail: redraw sidebar */
}
if (!first) {
/* on new mail: redraw sidebar */
- sidebar_draw (
CurrentMenu
);
+ sidebar_draw ();
mutt_message ("%s", buffylist);
return (1);
}
mutt_message ("%s", buffylist);
return (1);
}
@@
-563,23
+532,21
@@
int buffy_notify (void)
}
/*
}
/*
- *
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)
{
*
* 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);
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,
/*
* If buffy_lookup returns the index,
@@
-590,7
+557,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;
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;
}
((BUFFY*) Incoming->data[c])->new > 0)
break;
}
@@
-600,7
+567,7
@@
void buffy_next (char *s, size_t slen)
* reported new mail */
buffy_check (0);
} else {
* 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);
}
}
mutt_pretty_mailbox (s);
}
}