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
A-label expansion operators
[exim.git]
/
src
/
src
/
utf8.c
diff --git
a/src/src/utf8.c
b/src/src/utf8.c
index 2f8173dc1ad219d1d07e51e6fb6f69450c5ee9b3..9a2b8656e09e42d9c54b04a095780d96daf8eda7 100644
(file)
--- a/
src/src/utf8.c
+++ b/
src/src/utf8.c
@@
-78,14
+78,22
@@
size_t p_len = ucs4_len*4; /* this multiplier is pure guesswork */
uschar * res = store_get(p_len+5);
int rc;
uschar * res = store_get(p_len+5);
int rc;
+DEBUG(D_expand) debug_printf("l_u2a: ulen %d plen %d\n", ucs4_len, p_len);
+DEBUG(D_expand) for (rc = 0; rc < ucs4_len; rc++) debug_printf("%08x ", p[rc]);
+
res[0] = 'x'; res[1] = 'n'; res[2] = res[3] = '-';
if ((rc = punycode_encode(ucs4_len, p, NULL, &p_len, res+4)) != PUNYCODE_SUCCESS)
{
res[0] = 'x'; res[1] = 'n'; res[2] = res[3] = '-';
if ((rc = punycode_encode(ucs4_len, p, NULL, &p_len, res+4)) != PUNYCODE_SUCCESS)
{
+ DEBUG(D_expand) debug_printf("l_u2a: bad '%s'\n", punycode_strerror(rc));
free(p);
if (err) *err = US punycode_strerror(rc);
return NULL;
}
free(p);
if (err) *err = US punycode_strerror(rc);
return NULL;
}
+DEBUG(D_expand) debug_printf("l_u2a: plen %d\n", p_len);
+p_len += 4;
+DEBUG(D_expand) for (rc = 0; rc < p_len; rc++) debug_printf("%02x ", res[rc]);
+DEBUG(D_expand) debug_printf("\n");
free(p);
res[p_len] = '\0';
return res;
free(p);
res[p_len] = '\0';
return res;
@@
-97,6
+105,8
@@
string_localpart_alabel_to_utf8(const uschar * alabel, uschar ** err)
{
size_t p_len = strlen(alabel);
punycode_uint * p;
{
size_t p_len = strlen(alabel);
punycode_uint * p;
+uschar * s;
+uschar * res;
int rc;
if (alabel[0] != 'x' || alabel[1] != 'n' || alabel[2] != '-' || alabel[3] != '-')
int rc;
if (alabel[0] != 'x' || alabel[1] != 'n' || alabel[2] != '-' || alabel[3] != '-')
@@
-105,6
+115,7
@@
if (alabel[0] != 'x' || alabel[1] != 'n' || alabel[2] != '-' || alabel[3] != '-'
return NULL;
}
p_len -= 4;
return NULL;
}
p_len -= 4;
+DEBUG(D_expand) debug_printf("l_a2u: plen %d\n", p_len);
p = (punycode_uint *) store_get((p_len+1) * sizeof(*p));
p = (punycode_uint *) store_get((p_len+1) * sizeof(*p));
@@
-113,8
+124,12
@@
if ((rc = punycode_decode(p_len, CCS alabel+4, &p_len, p, NULL)) != PUNYCODE_SUC
if (err) *err = US punycode_strerror(rc);
return NULL;
}
if (err) *err = US punycode_strerror(rc);
return NULL;
}
-p[p_len] = 0;
-return US p;
+DEBUG(D_expand) debug_printf("l_a2u: dlen %d\n", p_len);
+
+s = stringprep_ucs4_to_utf8(p, p_len, NULL, &p_len);
+res = string_copyn(s, p_len);
+free(s);
+return res;
}
}