# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "charset.h"
#include "mutt_idna.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
/* The low-level interface we use. */
int mutt_idna_to_local (const char *in, char **out, int flags)
{
- *out = str_dup (in);
+ *out = m_strdup(in);
return 1;
}
int mutt_local_to_idna (const char *in, char **out)
{
- *out = str_dup (in);
+ *out = m_strdup(in);
return 0;
}
if ((flags & MI_MAY_BE_IRREVERSIBLE) == 0) {
int irrev = 0;
char *t2 = NULL;
- char *tmp = str_dup (*out);
+ char *tmp = m_strdup(*out);
if (mutt_convert_string (&tmp, Charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
irrev = 1;
irrev = 1;
}
- mem_free (&t2);
- mem_free (&tmp);
+ p_delete(&t2);
+ p_delete(&tmp);
if (irrev)
goto notrans;
return 0;
notrans:
- mem_free (out);
- *out = str_dup (in);
+ p_delete(out);
+ *out = m_strdup(in);
return 1;
}
int mutt_local_to_idna (const char *in, char **out)
{
int rv = 0;
- char *tmp = str_dup (in);
+ char *tmp = m_strdup(in);
*out = NULL;
if (!rv && idna_to_ascii_8z (tmp, out, 1) != IDNA_SUCCESS)
rv = -2;
- mem_free (&tmp);
+ p_delete(&tmp);
if (rv < 0) {
- mem_free (out);
- *out = str_dup (in);
+ p_delete(out);
+ *out = m_strdup(in);
}
return rv;
}
*domain = NULL;
p = strchr (mbx, '@');
- if (!p)
+ if (!p || !p[1])
return -1;
- *user = mem_calloc ((p - mbx + 1), sizeof (mbx[0]));
- strfcpy (*user, mbx, (p - mbx + 1));
- *domain = str_dup (p + 1);
+ *user = p_dupstr(mbx, p - mbx);
+ *domain = m_strdup(p + 1);
return 0;
}
-int mutt_addrlist_to_idna (ADDRESS * a, char **err)
+int mutt_addrlist_to_idna (address_t * a, const char **err)
{
char *user = NULL, *domain = NULL;
char *tmp = NULL;
if (mutt_local_to_idna (domain, &tmp) < 0) {
e = 1;
if (err)
- *err = str_dup (domain);
+ *err = m_strdup(domain);
}
else {
- mem_realloc (&a->mailbox, str_len (user) + str_len (tmp) + 2);
+ p_realloc(&a->mailbox, m_strlen(user) + m_strlen(tmp) + 2);
sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
}
- mem_free (&domain);
- mem_free (&user);
- mem_free (&tmp);
+ p_delete(&domain);
+ p_delete(&user);
+ p_delete(&tmp);
if (e)
return -1;
return 0;
}
-int mutt_addrlist_to_local (ADDRESS * a)
+int mutt_addrlist_to_local (address_t * a)
{
char *user, *domain;
char *tmp = NULL;
continue;
if (mutt_idna_to_local (domain, &tmp, 0) == 0) {
- mem_realloc (&a->mailbox, str_len (user) + str_len (tmp) + 2);
+ p_realloc(&a->mailbox, m_strlen(user) + m_strlen(tmp) + 2);
sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
}
- mem_free (&domain);
- mem_free (&user);
- mem_free (&tmp);
+ p_delete(&domain);
+ p_delete(&user);
+ p_delete(&tmp);
}
return 0;
}
/* convert just for displaying purposes */
-const char *mutt_addr_for_display (ADDRESS * a)
+const char *mutt_addr_for_display (address_t * a)
{
static char *buff = NULL;
char *tmp = NULL;
char *domain = NULL;
char *user = NULL;
- mem_free (&buff);
+ p_delete(&buff);
if (mbox_to_udomain (a->mailbox, &user, &domain) != 0)
return a->mailbox;
if (mutt_idna_to_local (domain, &tmp, MI_MAY_BE_IRREVERSIBLE) != 0) {
- mem_free (&user);
- mem_free (&domain);
- mem_free (&tmp);
+ p_delete(&user);
+ p_delete(&domain);
+ p_delete(&tmp);
return a->mailbox;
}
- mem_realloc (&buff, str_len (tmp) + str_len (user) + 2);
+ p_realloc(&buff, m_strlen(tmp) + m_strlen(user) + 2);
sprintf (buff, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
- mem_free (&tmp);
- mem_free (&user);
- mem_free (&domain);
+ p_delete(&tmp);
+ p_delete(&user);
+ p_delete(&domain);
return buff;
}
if (tag) *tag = #a; e = 1; err = NULL; \
}
-int mutt_env_to_idna (ENVELOPE * env, char **tag, char **err)
+int mutt_env_to_idna (ENVELOPE * env, const char **tag, const char **err)
{
int e = 0;