* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
+#include <lib-lib/lib-lib.h>
+
+#ifdef HAVE_LIBIDN
+#include <idna.h>
#endif
#include "mutt.h"
#include "charset.h"
#include "mutt_idna.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
-
/* The low-level interface we use. */
-#ifndef HAVE_LIBIDN
-
-int mutt_idna_to_local (const char *in, char **out, int flags)
-{
- *out = safe_strdup (in);
- return 1;
-}
-
-int mutt_local_to_idna (const char *in, char **out)
-{
- *out = safe_strdup (in);
- return 0;
-}
-
-#else
-
-int mutt_idna_to_local (const char *in, char **out, int flags)
+static int mutt_idna_to_local(const char *in, char **out, bool nonreverseok)
{
+#ifdef HAVE_LIBIDN
*out = NULL;
if (!option (OPTUSEIDN))
/* Is this the right function? Interesting effects with some bad identifiers! */
if (idna_to_unicode_8z8z (in, out, 1) != IDNA_SUCCESS)
goto notrans;
- if (mutt_convert_string (out, "utf-8", Charset, M_ICONV_HOOK_TO) == -1)
+ if (mutt_convert_string (out, "utf-8", mod_cset.charset, M_ICONV_HOOK_TO) == -1)
goto notrans;
/*
* domain name.
*/
- if ((flags & MI_MAY_BE_IRREVERSIBLE) == 0) {
+ if (nonreverseok) {
int irrev = 0;
char *t2 = NULL;
- char *tmp = safe_strdup (*out);
+ char *tmp = m_strdup(*out);
- if (mutt_convert_string (&tmp, Charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
+ if (mutt_convert_string (&tmp, mod_cset.charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
irrev = 1;
if (!irrev && idna_to_ascii_8z (tmp, &t2, 1) != IDNA_SUCCESS)
irrev = 1;
if (!irrev && ascii_strcasecmp (t2, in)) {
- dprint (1,
- (debugfile,
- "mutt_idna_to_local: Not reversible. in = '%s', t2 = '%s'.\n",
- in, t2));
irrev = 1;
}
- FREE (&t2);
- FREE (&tmp);
+ p_delete(&t2);
+ p_delete(&tmp);
if (irrev)
goto notrans;
return 0;
notrans:
- FREE (out);
- *out = safe_strdup (in);
+ p_delete(out);
+#endif
+ *out = m_strdup(in);
return 1;
}
-int mutt_local_to_idna (const char *in, char **out)
+static int mutt_local_to_idna (const char *in, char **out)
{
+#ifdef HAVE_LIBIDN
int rv = 0;
- char *tmp = safe_strdup (in);
+ char *tmp = m_strdup(in);
*out = NULL;
return -1;
}
- if (mutt_convert_string (&tmp, Charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
+ if (mutt_convert_string (&tmp, mod_cset.charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
rv = -1;
if (!rv && idna_to_ascii_8z (tmp, out, 1) != IDNA_SUCCESS)
rv = -2;
- FREE (&tmp);
+ p_delete(&tmp);
if (rv < 0) {
- FREE (out);
- *out = safe_strdup (in);
+ p_delete(out);
+ *out = m_strdup(in);
}
return rv;
-}
-
+#else
+ *out = m_strdup(in);
+ return 0;
#endif
-
+}
/* higher level functions */
*domain = NULL;
p = strchr (mbx, '@');
- if (!p)
+ if (!p || !p[1])
return -1;
- *user = safe_calloc ((p - mbx + 1), sizeof (mbx[0]));
- strfcpy (*user, mbx, (p - mbx + 1));
- *domain = safe_strdup (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, char **err)
{
char *user = NULL, *domain = NULL;
char *tmp = NULL;
if (mutt_local_to_idna (domain, &tmp) < 0) {
e = 1;
if (err)
- *err = safe_strdup (domain);
+ *err = m_strdup(domain);
}
else {
- safe_realloc (&a->mailbox, mutt_strlen (user) + mutt_strlen (tmp) + 2);
- sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
+ p_realloc(&a->mailbox, m_strlen(user) + m_strlen(tmp) + 2);
+ sprintf(a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));
}
- FREE (&domain);
- FREE (&user);
- 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;
if (mbox_to_udomain (a->mailbox, &user, &domain) == -1)
continue;
- if (mutt_idna_to_local (domain, &tmp, 0) == 0) {
- safe_realloc (&a->mailbox, mutt_strlen (user) + mutt_strlen (tmp) + 2);
- sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
+ if (mutt_idna_to_local(domain, &tmp, false) == 0) {
+ p_realloc(&a->mailbox, m_strlen(user) + m_strlen(tmp) + 2);
+ sprintf(a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));
}
- FREE (&domain);
- FREE (&user);
- 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;
- 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) {
- FREE (&user);
- FREE (&domain);
- FREE (&tmp);
+ if (mutt_idna_to_local (domain, &tmp, true) != 0) {
+ p_delete(&user);
+ p_delete(&domain);
+ p_delete(&tmp);
return a->mailbox;
}
- safe_realloc (&buff, mutt_strlen (tmp) + mutt_strlen (user) + 2);
- sprintf (buff, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
- FREE (&tmp);
- FREE (&user);
- FREE (&domain);
+ p_realloc(&buff, m_strlen(tmp) + m_strlen(user) + 2);
+ sprintf(buff, "%s@%s", NONULL (user), NONULL (tmp));
+ 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, char **err)
{
int e = 0;
projects / apps / madmutt.git / blobdiff