git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tidying
[exim.git]
/
src
/
src
/
utf8.c
diff --git
a/src/src/utf8.c
b/src/src/utf8.c
index e8690fc39da290006dbd5f7448780ebc88181d67..16a53037de383165904c11bb33aee7d532e76253 100644
(file)
--- a/
src/src/utf8.c
+++ b/
src/src/utf8.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Jeremy Harris 2015
, 2016
*/
+/* Copyright (c) Jeremy Harris 2015
- 2018
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-68,7
+68,7
@@
any mixed-case annotation. This does not really matter for a domain. */
break;
}
}
break;
}
}
-if ((rc = idn2_lookup_u8(
CCS
s, &s1, IDN2_NFC_INPUT)) != IDN2_OK)
+if ((rc = idn2_lookup_u8(
(const uint8_t *)
s, &s1, IDN2_NFC_INPUT)) != IDN2_OK)
{
if (err) *err = US idn2_strerror(rc);
return NULL;
{
if (err) *err = US idn2_strerror(rc);
return NULL;
@@
-97,7
+97,7
@@
string_domain_alabel_to_utf8(const uschar * alabel, uschar ** err)
#ifdef SUPPORT_I18N_2008
const uschar * label;
int sep = '.';
#ifdef SUPPORT_I18N_2008
const uschar * label;
int sep = '.';
-
uschar * s
= NULL;
+
gstring * g
= NULL;
while (label = string_nextinlist(&alabel, &sep, NULL, 0))
if ( string_is_alabel(label)
while (label = string_nextinlist(&alabel, &sep, NULL, 0))
if ( string_is_alabel(label)
@@
-105,8
+105,8
@@
while (label = string_nextinlist(&alabel, &sep, NULL, 0))
)
return NULL;
else
)
return NULL;
else
-
s = string_append_listele(s
, '.', label);
-return s;
+
g = string_append_listele(g
, '.', label);
+return s
tring_from_gstring(g)
;
#else
#else
@@
-202,7
+202,7
@@
return NULL;
/* Whole address conversion.
The *err string pointer should be null before the call.
/* Whole address conversion.
The *err string pointer should be null before the call.
-Return NULL on
oee
ror, with (optional) errstring pointer filled in
+Return NULL on
er
ror, with (optional) errstring pointer filled in
*/
uschar *
*/
uschar *