projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make m_dupstr return NULL if the string was empty.
[apps/madmutt.git]
/
imap
/
message.c
diff --git
a/imap/message.c
b/imap/message.c
index
4781a36
..
c6db226
100644
(file)
--- a/
imap/message.c
+++ b/
imap/message.c
@@
-18,10
+18,11
@@
#include <ctype.h>
#include <lib-lib/mem.h>
#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 "mutt.h"
-#include "ascii.h"
-#include "buffer.h"
#include "mutt_curses.h"
#include "imap_private.h"
#include "message.h"
#include "mutt_curses.h"
#include "imap_private.h"
#include "message.h"
@@
-32,9
+33,8
@@
#include "pgp.h"
#endif
#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
#include "lib/debug.h"
#if HAVE_STDINT_H
@@
-132,7
+132,7
@@
int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
mutt_message (_("Evaluating cache... [%d/%d]"), msgno + 1, msgend + 1);
rewind (fp);
mutt_message (_("Evaluating cache... [%d/%d]"), msgno + 1, msgend + 1);
rewind (fp);
-
memset (&h, 0, sizeof (h)
);
+
p_clear(&h, 1
);
h.data = p_new(IMAP_HEADER_DATA, 1);
do {
mfhrc = 0;
h.data = p_new(IMAP_HEADER_DATA, 1);
do {
mfhrc = 0;
@@
-223,7
+223,7
@@
int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
/* freshen fp, h */
rewind (fp);
/* freshen fp, h */
rewind (fp);
-
memset (&h, 0, sizeof (h)
);
+
p_clear(&h, 1
);
h.data = p_new(IMAP_HEADER_DATA, 1);
/* this DO loop does two things:
h.data = p_new(IMAP_HEADER_DATA, 1);
/* this DO loop does two things:
@@
-356,7
+356,7
@@
int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
cache->uid = HEADER_DATA (h)->uid;
mutt_mktemp (path);
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;
if (!(msg->fp = safe_fopen (path, "w+"))) {
p_delete(&cache->path);
return -1;
@@
-642,8
+642,8
@@
int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete)
imap_fix_path (idata, mx.mbox, mbox, sizeof (mbox));
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 */
mutt_buffer_addstr (&cmd, "UID COPY ");
/* Null HEADER* means copy tagged messages */
@@
-771,8
+771,8
@@
void imap_add_keywords (char *s, HEADER * h, LIST * mailbox_flags,
while (keywords) {
if (msg_has_flag (mailbox_flags, keywords->data)) {
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;
}
}
keywords = keywords->next;
}
@@
-795,7
+795,7
@@
char *imap_set_flags (IMAP_DATA * idata, HEADER * h, char *s)
IMAP_HEADER newh;
unsigned char readonly;
IMAP_HEADER newh;
unsigned char readonly;
-
memset (&newh, 0, sizeof (newh)
);
+
p_clear(&newh, 1
);
newh.data = p_new(IMAP_HEADER_DATA, 1);
debug_print (2, ("parsing FLAGS\n"));
newh.data = p_new(IMAP_HEADER_DATA, 1);
debug_print (2, ("parsing FLAGS\n"));
@@
-895,7
+895,7
@@
static int msg_fetch_header (CONTEXT * ctx, IMAP_HEADER * h, char *buf,
#ifdef USE_HCACHE
static size_t imap_hcache_keylen (const char *fn)
{
#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.
}
/* msg_fetch_header: import IMAP FETCH response into an IMAP_HEADER.
@@
-951,7
+951,7
@@
static int msg_has_flag (LIST * flag_list, const char *flag)
flag_list = flag_list->next;
while (flag_list) {
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;
flag_list = flag_list->next;