From a17256a4fa281d1e84fa56c49689bc146dd73c6e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 13 Mar 2004 06:50:10 +0000 Subject: Update. * idna.c (idna_to_ascii_4z): Use strdup if available. Unify two ifs. * idn-stub.c: Implement __idna_to_unicode_lzlz. Split __idna_to_ascii_lz in two parts so that loading can be shared with the new function. * Versions (libcidn): Export idna_to_unicode_lzlz. --- libidn/idna.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'libidn/idna.c') diff --git a/libidn/idna.c b/libidn/idna.c index 69c928fc42..b89350f1f3 100644 --- a/libidn/idna.c +++ b/libidn/idna.c @@ -437,24 +437,21 @@ idna_to_ascii_4z (const uint32_t * input, char **output, int flags) U+3002 (ideographic full stop), U+FF0E (fullwidth full stop), U+FF61 (halfwidth ideographic full stop). */ - if (input[0] == 0) + if (input[0] == 0 + /* Handle explicit zero-length root label. */ + || (DOTP (input[0]) && input[1] == 0)) { +#if defined HAVE_STRDUP || defined _LIBC + *output = strdup (input); + return *output == NULL ? IDNA_MALLOC_ERROR : IDNA_SUCCESS; +#else /* Handle implicit zero-length root label. */ *output = malloc (1); if (!*output) return IDNA_MALLOC_ERROR; - strcpy (*output, ""); - return IDNA_SUCCESS; - } - - if (DOTP (input[0]) && input[1] == 0) - { - /* Handle explicit zero-length root label. */ - *output = malloc (2); - if (!*output) - return IDNA_MALLOC_ERROR; - strcpy (*output, "."); + strcpy (*output, input); return IDNA_SUCCESS; +#endif } *output = NULL; -- cgit v1.2.1