X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_idna.c;h=918aa26a367e67d84442c2d5520011185c49358a;hp=bc7a976a2736fd8b36fa26badbd5305a80857c79;hb=98f62b5fcbd680fd5214ee85e1635b84322cbdd1;hpb=f404a0ca916be07049af51a3022baaaaab94def6 diff --git a/mutt_idna.c b/mutt_idna.c index bc7a976..918aa26 100644 --- a/mutt_idna.c +++ b/mutt_idna.c @@ -1,23 +1,16 @@ /* + * Copyright notice from original mutt: * Copyright (C) 2003 Thomas Roessler - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. - */ - -#if HAVE_CONFIG_H -# include "config.h" + * + * This file is part of mutt-ng, see http://www.muttng.org/. + * It's licensed under the GNU General Public License, + * please see the file GPL in the top level source directory. + */ + +#include + +#ifdef HAVE_LIBIDN +#include #endif #include "mutt.h" @@ -26,24 +19,9 @@ /* 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)) @@ -51,193 +29,187 @@ int mutt_idna_to_local (const char *in, char **out, int flags) if (!in) goto notrans; - + /* 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; /* * make sure that we can convert back and come out with the same * domain name. */ - - if ((flags & MI_MAY_BE_IRREVERSIBLE) == 0) - { + + if (nonreverseok) { int irrev = 0; char *t2 = NULL; - char *tmp = safe_strdup (*out); - if (mutt_convert_string (&tmp, Charset, "utf-8", M_ICONV_HOOK_FROM) == -1) + char *tmp = m_strdup(*out); + + 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)); + if (!irrev && ascii_strcasecmp (t2, in)) { 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); + +notrans: + 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; - if (!in) - { + if (!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); - if (rv < 0) - { - FREE (out); - *out = safe_strdup (in); + + p_delete(&tmp); + if (rv < 0) { + p_delete(out); + *out = m_strdup(in); } return rv; -} - +#else + *out = m_strdup(in); + return 0; #endif - +} /* higher level functions */ static int mbox_to_udomain (const char *mbx, char **user, char **domain) { char *p; + *user = NULL; *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; int e = 0; - + if (err) *err = NULL; - for (; a; a = a->next) - { + for (; a; a = a->next) { if (!a->mailbox) continue; if (mbox_to_udomain (a->mailbox, &user, &domain) == -1) continue; - - if (mutt_local_to_idna (domain, &tmp) < 0) - { + + 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__ */ + else { + 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; - - for (; a; a = a->next) - { + + for (; a; a = a->next) { if (!a->mailbox) continue; 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; + /* user and domain will be either allocated or reseted to the NULL in * the mbox_to_udomain(), but for safety... */ 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; } /* Convert an ENVELOPE structure */ -void mutt_env_to_local (ENVELOPE *e) +void mutt_env_to_local (ENVELOPE * e) { mutt_addrlist_to_local (e->return_path); mutt_addrlist_to_local (e->from); @@ -258,16 +230,17 @@ void mutt_env_to_local (ENVELOPE *e) 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; - H_TO_IDNA(return_path); - H_TO_IDNA(from); - H_TO_IDNA(to); - H_TO_IDNA(cc); - H_TO_IDNA(bcc); - H_TO_IDNA(reply_to); - H_TO_IDNA(mail_followup_to); + + H_TO_IDNA (return_path); + H_TO_IDNA (from); + H_TO_IDNA (to); + H_TO_IDNA (cc); + H_TO_IDNA (bcc); + H_TO_IDNA (reply_to); + H_TO_IDNA (mail_followup_to); return e; }