projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework includes a bit
[apps/madmutt.git]
/
buffy.c
diff --git
a/buffy.c
b/buffy.c
index
68b9165
..
4a30783
100644
(file)
--- a/
buffy.c
+++ b/
buffy.c
@@
-18,18
+18,16
@@
#include <lib-lib/buffer.h>
#include <lib-lib/macros.h>
#include <lib-lib/buffer.h>
#include <lib-lib/macros.h>
+#include <lib-ui/curses.h>
+
+#include <imap/imap.h>
+
#include "mutt.h"
#include "buffy.h"
#include "mx.h"
#include "mh.h"
#include "sidebar.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 <string.h>
#include <sys/stat.h>
@@
-42,9
+40,7
@@
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 */
@@
-105,13
+101,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;
}
@@
-176,18
+172,18
@@
static void buffy_free (BUFFY** p) {
}
int buffy_lookup (const char* path) {
}
int buffy_lookup (const char* path) {
- int i = 0;
+
unsigned
int i = 0;
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
+194,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
+269,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
+
unsigned 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
+322,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
+427,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
+448,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
+465,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
}
}
}
}
@@
-506,7
+492,7
@@
int buffy_list (void)
int pos;
int first;
int have_unnotified = BuffyNotify;
int pos;
int first;
int have_unnotified = BuffyNotify;
- int i = 0;
+
unsigned
int i = 0;
pos = 0;
first = 1;
pos = 0;
first = 1;
@@
-519,7
+505,7
@@
int buffy_list (void)
if (tmp->new <= 0 || (have_unnotified && tmp->notified))
continue;
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)
@@
-570,7
+556,8
@@
int buffy_notify (void)
*/
void buffy_next (char *s, size_t slen)
{
*/
void buffy_next (char *s, size_t slen)
{
- int i = 0, c = 0, l = 0;
+ unsigned int l = 0;
+ int c = 0, i = 0;
if (list_empty(Incoming))
return;
if (list_empty(Incoming))
return;
@@
-590,7
+577,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
+587,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);
}
}