projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop str_[n]cat.
[apps/madmutt.git]
/
imap
/
util.c
diff --git
a/imap/util.c
b/imap/util.c
index
1025cea
..
8e6832b
100644
(file)
--- a/
imap/util.c
+++ b/
imap/util.c
@@
-14,16
+14,15
@@
#include "config.h"
#include <lib-lib/mem.h>
#include "config.h"
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include "mutt.h"
#include "mx.h" /* for M_IMAP */
#include "mutt.h"
#include "mx.h" /* for M_IMAP */
-#include "ascii.h"
#include "url.h"
#include "imap_private.h"
#include "mutt_ssl.h"
#include "url.h"
#include "imap_private.h"
#include "mutt_ssl.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
#include "lib/debug.h"
#include <stdlib.h>
#include "lib/debug.h"
#include <stdlib.h>
@@
-97,7
+96,7
@@
int imap_parse_path (const char *path, IMAP_MBOX * mx)
mx->account.port = ImapPort;
mx->account.type = M_ACCT_TYPE_IMAP;
mx->account.port = ImapPort;
mx->account.type = M_ACCT_TYPE_IMAP;
- c =
str_dup
(path);
+ c =
m_strdup
(path);
url_parse_ciss (&url, c);
if (!(url.scheme == U_IMAP || url.scheme == U_IMAPS) ||
url_parse_ciss (&url, c);
if (!(url.scheme == U_IMAP || url.scheme == U_IMAPS) ||
@@
-106,7
+105,7
@@
int imap_parse_path (const char *path, IMAP_MBOX * mx)
return -1;
}
return -1;
}
- mx->mbox =
str_dup
(url.path);
+ mx->mbox =
m_strdup
(url.path);
if (url.scheme == U_IMAPS)
mx->account.flags |= M_ACCT_SSL;
if (url.scheme == U_IMAPS)
mx->account.flags |= M_ACCT_SSL;
@@
-133,10
+132,10
@@
void imap_pretty_mailbox (char *path)
if (imap_parse_path (path, &target) < 0)
return;
if (imap_parse_path (path, &target) < 0)
return;
- tlen =
str_len
(target.mbox);
+ tlen =
m_strlen
(target.mbox);
/* check whether we can do '=' substitution */
if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) {
/* check whether we can do '=' substitution */
if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) {
- hlen =
str_len
(home.mbox);
+ hlen =
m_strlen
(home.mbox);
if (tlen && mutt_account_match (&home.account, &target.account) &&
!str_ncmp (home.mbox, target.mbox, hlen)) {
if (!hlen)
if (tlen && mutt_account_match (&home.account, &target.account) &&
!str_ncmp (home.mbox, target.mbox, hlen)) {
if (!hlen)
@@
-191,7
+190,7
@@
void imap_error (const char *where, const char *msg)
* Returns NULL on failure (no mem) */
IMAP_DATA *imap_new_idata (void)
{
* Returns NULL on failure (no mem) */
IMAP_DATA *imap_new_idata (void)
{
- return
mem_calloc (1, sizeof (IMAP_DATA)
);
+ return
p_new(IMAP_DATA, 1
);
}
/* imap_free_idata: Release and clear storage in an IMAP_DATA structure. */
}
/* imap_free_idata: Release and clear storage in an IMAP_DATA structure. */
@@
-427,7
+426,7
@@
void imap_munge_mbox_name (char *dest, size_t dlen, const char *src)
{
char *buf;
{
char *buf;
- buf =
str_dup
(src);
+ buf =
m_strdup
(src);
imap_utf7_encode (&buf);
imap_quote_string (dest, dlen, buf);
imap_utf7_encode (&buf);
imap_quote_string (dest, dlen, buf);
@@
-441,10
+440,10
@@
void imap_unmunge_mbox_name (char *s)
imap_unquote_string (s);
imap_unquote_string (s);
- buf =
str_dup
(s);
+ buf =
m_strdup
(s);
if (buf) {
imap_utf7_decode (&buf);
if (buf) {
imap_utf7_decode (&buf);
-
strncpy (s, buf, str_len (s)
);
+
m_strcpy(s, m_strlen(s) + 1, buf
);
}
p_delete(&buf);
}
p_delete(&buf);
@@
-497,7
+496,7
@@
void imap_keepalive (void)
if (idata->ctx)
ctx = idata->ctx;
else {
if (idata->ctx)
ctx = idata->ctx;
else {
- ctx =
mem_calloc (1, sizeof (CONTEXT)
);
+ ctx =
p_new(CONTEXT, 1
);
ctx->data = idata;
}
imap_check_mailbox (ctx, NULL, 1);
ctx->data = idata;
}
imap_check_mailbox (ctx, NULL, 1);