# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/buffer.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "buffy.h"
-#include "buffer.h"
#include "mx.h"
#include "mh.h"
#include "sidebar.h"
#include "imap.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
#include <string.h>
#include <sys/stat.h>
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);
}
/* func to free buffy for list_del() */
static void buffy_free (BUFFY** p) {
- mem_free(&(*p)->path);
- mem_free(p);
+ p_delete(&(*p)->path);
+ p_delete(p);
}
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 (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;
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;
* 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:
BuffyCount++;
if (count) {
DIR *dp;
- struct dirent *de;
if ((dp = opendir (path)) == NULL)
break;
int pos;
int first;
int have_unnotified = BuffyNotify;
- int i = 0;
+ unsigned int i = 0;
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];
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__ */
+ /* pos += m_strlen(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__ */
+ pos += m_strlen(strncat (buffylist + pos, path, sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
first = 0;
}
}
*/
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;
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