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 2bc81e839cfa235b39137360484b1f787aaef5ee..c05853838de0162bd47c1bfa921a909aa540946e 100644
(file)
--- a/
src/src/utf8.c
+++ b/
src/src/utf8.c
@@
-2,8
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2022 */
/* Copyright (c) Jeremy Harris 2015 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
/* Copyright (c) Jeremy Harris 2015 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "exim.h"
#include "exim.h"
@@
-148,7
+150,7
@@
if (!p || !ucs4_len)
return NULL;
}
p_len = ucs4_len*4; /* this multiplier is pure guesswork */
return NULL;
}
p_len = ucs4_len*4; /* this multiplier is pure guesswork */
-res = store_get(p_len+5,
is_tainted(utf8)
);
+res = store_get(p_len+5,
utf8
);
res[0] = 'x'; res[1] = 'n'; res[2] = res[3] = '-';
res[0] = 'x'; res[1] = 'n'; res[2] = res[3] = '-';
@@
-177,7
+179,7
@@
uschar * s, * res;
DEBUG(D_expand) debug_printf("l_a2u: '%s'\n", alabel);
alabel += 4;
p_len = Ustrlen(alabel);
DEBUG(D_expand) debug_printf("l_a2u: '%s'\n", alabel);
alabel += 4;
p_len = Ustrlen(alabel);
-p = store_get((p_len+1) * sizeof(*p),
is_tainted(alabel)
);
+p = store_get((p_len+1) * sizeof(*p),
alabel
);
if ((rc = punycode_decode(p_len, CCS alabel, &p_len, p, NULL)) != PUNYCODE_SUCCESS)
{
if ((rc = punycode_decode(p_len, CCS alabel, &p_len, p, NULL)) != PUNYCODE_SUCCESS)
{
@@
-245,28
+247,29
@@
return l;
/* See a description in tls-openssl.c for an explanation of why this exists.
/* See a description in tls-openssl.c for an explanation of why this exists.
-Arguments:
a FILE* to print the results
to
-Returns:
noth
ing
+Arguments:
string to append
to
+Returns:
str
ing
*/
*/
-void
-utf8_version_report(
FILE *f
)
+gstring *
+utf8_version_report(
gstring * g
)
{
#ifdef SUPPORT_I18N_2008
{
#ifdef SUPPORT_I18N_2008
-
fprintf(f
, "Library version: IDN2: Compile: %s\n"
+
g = string_fmt_append(g
, "Library version: IDN2: Compile: %s\n"
" Runtime: %s\n",
IDN2_VERSION,
idn2_check_version(NULL));
" Runtime: %s\n",
IDN2_VERSION,
idn2_check_version(NULL));
-
fprintf(f
, "Library version: Stringprep: Compile: %s\n"
+
g = string_fmt_append(g
, "Library version: Stringprep: Compile: %s\n"
" Runtime: %s\n",
STRINGPREP_VERSION,
stringprep_check_version(NULL));
#else
" Runtime: %s\n",
STRINGPREP_VERSION,
stringprep_check_version(NULL));
#else
-
fprintf(f
, "Library version: IDN: Compile: %s\n"
+
g = string_fmt_append(g
, "Library version: IDN: Compile: %s\n"
" Runtime: %s\n",
STRINGPREP_VERSION,
stringprep_check_version(NULL));
#endif
" Runtime: %s\n",
STRINGPREP_VERSION,
stringprep_check_version(NULL));
#endif
+return g;
}
#endif /* whole file */
}
#endif /* whole file */