#include <ctype.h>
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/buffer.h>
#include "mutt.h"
-#include "ascii.h"
-#include "buffer.h"
#include "mutt_curses.h"
#include "imap_private.h"
#include "message.h"
#include "pgp.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include "lib/debug.h"
#if HAVE_STDINT_H
mutt_message (_("Evaluating cache... [%d/%d]"), msgno + 1, msgend + 1);
rewind (fp);
- memset (&h, 0, sizeof (h));
- h.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
+ p_clear(&h, 1);
+ h.data = p_new(IMAP_HEADER_DATA, 1);
do {
mfhrc = 0;
/* freshen fp, h */
rewind (fp);
- memset (&h, 0, sizeof (h));
- h.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
+ p_clear(&h, 1);
+ h.data = p_new(IMAP_HEADER_DATA, 1);
/* this DO loop does two things:
* 1. handles untagged messages, so we can try again on the same msg
cache->uid = HEADER_DATA (h)->uid;
mutt_mktemp (path);
- cache->path = str_dup (path);
+ cache->path = m_strdup(path);
if (!(msg->fp = safe_fopen (path, "w+"))) {
p_delete(&cache->path);
return -1;
debug_print (1, ("command failed: %s\n", idata->cmd.buf));
- pc = idata->cmd.buf + SEQLEN;
- SKIPWS (pc);
+ pc = vskipspaces(idata->cmd.buf + SEQLEN);
pc = imap_next_word (pc);
mutt_error ("%s", pc);
mutt_sleep (1);
char *pc;
debug_print (1, ("command failed: %s\n", idata->cmd.buf));
- pc = idata->cmd.buf + SEQLEN;
- SKIPWS (pc);
+ pc = vskipspaces(idata->cmd.buf + SEQLEN);
pc = imap_next_word (pc);
mutt_error ("%s", pc);
mutt_sleep (1);
imap_fix_path (idata, mx.mbox, mbox, sizeof (mbox));
- memset (&sync_cmd, 0, sizeof (sync_cmd));
- memset (&cmd, 0, sizeof (cmd));
+ p_clear(&sync_cmd, 1);
+ p_clear(&cmd, 1);
mutt_buffer_addstr (&cmd, "UID COPY ");
/* Null HEADER* means copy tagged messages */
while (keywords) {
if (msg_has_flag (mailbox_flags, keywords->data)) {
- str_cat (s, slen, keywords->data);
- str_cat (s, slen, " ");
+ m_strcat(s, slen, keywords->data);
+ m_strcat(s, slen, " ");
}
keywords = keywords->next;
}
IMAP_HEADER newh;
unsigned char readonly;
- memset (&newh, 0, sizeof (newh));
- newh.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
+ p_clear(&newh, 1);
+ newh.data = p_new(IMAP_HEADER_DATA, 1);
debug_print (2, ("parsing FLAGS\n"));
if ((s = msg_parse_flags (&newh, s)) == NULL) {
#ifdef USE_HCACHE
static size_t imap_hcache_keylen (const char *fn)
{
- return str_len (fn);
+ return m_strlen(fn);
}
/* msg_fetch_header: import IMAP FETCH response into an IMAP_HEADER.
flag_list = flag_list->next;
while (flag_list) {
- if (!ascii_strncasecmp (flag_list->data, flag, str_len (flag_list->data)))
+ if (!ascii_strncasecmp (flag_list->data, flag, m_strlen(flag_list->data)))
return 1;
flag_list = flag_list->next;
return -1;
while (*s) {
- SKIPWS (s);
+ s = vskipspaces(s);
if (ascii_strncasecmp ("FLAGS", s, 5) == 0) {
if ((s = msg_parse_flags (h, s)) == NULL)
return -1;
}
else if (ascii_strncasecmp ("UID", s, 3) == 0) {
- s += 3;
- SKIPWS (s);
+ s = vskipspaces(s + 3);
h->data->uid = (unsigned int) atoi (s);
s = imap_next_word (s);
}
else if (ascii_strncasecmp ("INTERNALDATE", s, 12) == 0) {
- s += 12;
- SKIPWS (s);
+ s = vskipspaces(s + 12);
if (*s != '\"') {
debug_print (1, ("bogus INTERNALDATE entry: %s\n", s));
return -1;
h->received = imap_parse_date (tmp);
}
else if (ascii_strncasecmp ("RFC822.SIZE", s, 11) == 0) {
- s += 11;
- SKIPWS (s);
+ s = vskipspaces(s + 11);
ptmp = tmp;
while (isdigit ((unsigned char) *s))
*ptmp++ = *s++;
debug_print (1, ("not a FLAGS response: %s\n", s));
return NULL;
}
- s += 5;
- SKIPWS (s);
+ s = vskipspaces(s + 5);
if (*s != '(') {
debug_print (1, ("bogus FLAGS response: %s\n", s));
return NULL;
mutt_add_list (h->data->keywords, flag_word);
*s = ctmp;
}
- SKIPWS (s);
+ s = vskipspaces(s);
}
/* wrap up, or note bad flags response */