projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
less and less cruft: always compile socket support in
[apps/madmutt.git]
/
buffy.c
diff --git
a/buffy.c
b/buffy.c
index
99a746d
..
f2d4887
100644
(file)
--- a/
buffy.c
+++ b/
buffy.c
@@
-79,7
+79,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
+87,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);
}
@@
-176,18
+176,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
+198,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,7
+273,8
@@
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;
+ unsigned int i = 0;
+ int local = 0, count = 0;
#ifdef USE_IMAP
time_t last2;
#ifdef USE_IMAP
time_t last2;
@@
-333,7
+334,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
+439,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;
@@
-506,7
+506,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
+519,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
+570,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
+591,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
+601,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);
}
}