projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more crypt simplifications
[apps/madmutt.git]
/
mutt_idna.c
diff --git
a/mutt_idna.c
b/mutt_idna.c
index
1ad3b62
..
686e849
100644
(file)
--- a/
mutt_idna.c
+++ b/
mutt_idna.c
@@
-7,35
+7,29
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
-#include <lib-lib/mem.h>
+#ifdef HAVE_LIBIDN
+#include <idna.h>
+#endif
#include "mutt.h"
#include "mutt.h"
-#include "ascii.h"
#include "charset.h"
#include "mutt_idna.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. */
#ifndef HAVE_LIBIDN
/* The low-level interface we use. */
#ifndef HAVE_LIBIDN
-int mutt_idna_to_local (const char *in, char **out, int flags)
+int mutt_idna_to_local (const char *in, char **out, int flags
__attribute__ ((unused))
)
{
{
- *out =
str_dup
(in);
+ *out =
m_strdup
(in);
return 1;
}
int mutt_local_to_idna (const char *in, char **out)
{
return 1;
}
int mutt_local_to_idna (const char *in, char **out)
{
- *out =
str_dup
(in);
+ *out =
m_strdup
(in);
return 0;
}
return 0;
}
@@
-54,7
+48,7
@@
int mutt_idna_to_local (const char *in, char **out, int flags)
/* Is this the right function? Interesting effects with some bad identifiers! */
if (idna_to_unicode_8z8z (in, out, 1) != IDNA_SUCCESS)
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",
C
harset, M_ICONV_HOOK_TO) == -1)
+ if (mutt_convert_string (out, "utf-8",
MCharset.c
harset, M_ICONV_HOOK_TO) == -1)
goto notrans;
/*
goto notrans;
/*
@@
-65,14
+59,13
@@
int mutt_idna_to_local (const char *in, char **out, int flags)
if ((flags & MI_MAY_BE_IRREVERSIBLE) == 0) {
int irrev = 0;
char *t2 = NULL;
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,
C
harset, "utf-8", M_ICONV_HOOK_FROM) == -1)
+ if (mutt_convert_string (&tmp,
MCharset.c
harset, "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)) {
irrev = 1;
if (!irrev && idna_to_ascii_8z (tmp, &t2, 1) != IDNA_SUCCESS)
irrev = 1;
if (!irrev && ascii_strcasecmp (t2, in)) {
- debug_print (1, ("not reversible. in = '%s', t2 = '%s'.\n", in, t2));
irrev = 1;
}
irrev = 1;
}
@@
-87,14
+80,14
@@
int mutt_idna_to_local (const char *in, char **out, int flags)
notrans:
p_delete(out);
notrans:
p_delete(out);
- *out =
str_dup
(in);
+ *out =
m_strdup
(in);
return 1;
}
int mutt_local_to_idna (const char *in, char **out)
{
int rv = 0;
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;
*out = NULL;
@@
-103,7
+96,7
@@
int mutt_local_to_idna (const char *in, char **out)
return -1;
}
return -1;
}
- if (mutt_convert_string (&tmp,
C
harset, "utf-8", M_ICONV_HOOK_FROM) == -1)
+ if (mutt_convert_string (&tmp,
MCharset.c
harset, "utf-8", M_ICONV_HOOK_FROM) == -1)
rv = -1;
if (!rv && idna_to_ascii_8z (tmp, out, 1) != IDNA_SUCCESS)
rv = -2;
rv = -1;
if (!rv && idna_to_ascii_8z (tmp, out, 1) != IDNA_SUCCESS)
rv = -2;
@@
-111,7
+104,7
@@
int mutt_local_to_idna (const char *in, char **out)
p_delete(&tmp);
if (rv < 0) {
p_delete(out);
p_delete(&tmp);
if (rv < 0) {
p_delete(out);
- *out =
str_dup
(in);
+ *out =
m_strdup
(in);
}
return rv;
}
}
return rv;
}
@@
-131,13
+124,12
@@
static int mbox_to_udomain (const char *mbx, char **user, char **domain)
p = strchr (mbx, '@');
if (!p || !p[1])
return -1;
p = strchr (mbx, '@');
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;
}
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;
{
char *user = NULL, *domain = NULL;
char *tmp = NULL;
@@
-155,11
+147,11
@@
int mutt_addrlist_to_idna (ADDRESS * a, char **err)
if (mutt_local_to_idna (domain, &tmp) < 0) {
e = 1;
if (err)
if (mutt_local_to_idna (domain, &tmp) < 0) {
e = 1;
if (err)
- *err =
str_dup
(domain);
+ *err =
m_strdup
(domain);
}
else {
}
else {
-
mem_realloc (&a->mailbox, str_len (user) + str_len
(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));
}
p_delete(&domain);
}
p_delete(&domain);
@@
-173,7
+165,7
@@
int mutt_addrlist_to_idna (ADDRESS * a, char **err)
return 0;
}
return 0;
}
-int mutt_addrlist_to_local (
ADDRESS
* a)
+int mutt_addrlist_to_local (
address_t
* a)
{
char *user, *domain;
char *tmp = NULL;
{
char *user, *domain;
char *tmp = NULL;
@@
-185,8
+177,8
@@
int mutt_addrlist_to_local (ADDRESS * a)
continue;
if (mutt_idna_to_local (domain, &tmp, 0) == 0) {
continue;
if (mutt_idna_to_local (domain, &tmp, 0) == 0) {
-
mem_realloc (&a->mailbox, str_len (user) + str_len
(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));
}
p_delete(&domain);
}
p_delete(&domain);
@@
-198,7
+190,7
@@
int mutt_addrlist_to_local (ADDRESS * a)
}
/* convert just for displaying purposes */
}
/* 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;
{
static char *buff = NULL;
char *tmp = NULL;
@@
-219,8
+211,8
@@
const char *mutt_addr_for_display (ADDRESS * a)
return a->mailbox;
}
return a->mailbox;
}
-
mem_realloc (&buff, str_len (tmp) + str_len
(user) + 2);
- sprintf
(buff, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
+
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);
p_delete(&tmp);
p_delete(&user);
p_delete(&domain);
@@
-250,7
+242,7
@@
void mutt_env_to_local (ENVELOPE * e)
if (tag) *tag = #a; e = 1; err = NULL; \
}
if (tag) *tag = #a; e = 1; err = NULL; \
}
-int mutt_env_to_idna (ENVELOPE * env, const char **tag, c
onst c
har **err)
+int mutt_env_to_idna (ENVELOPE * env, const char **tag, char **err)
{
int e = 0;
{
int e = 0;