qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ulrich Drepper 2004-03-13 06:50:10 +00:00
parent 4be2c5fcd8
commit a17256a4fa
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libidn/ChangeLog
View File

@ -1,5 +1,12 @@
2004-03-12 Ulrich Drepper <drepper@redhat.com> 2004-03-12 Ulrich Drepper <drepper@redhat.com>
* 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.
* Makefile (libcidn-inhibit-o): Define. We need no archive. * Makefile (libcidn-inhibit-o): Define. We need no archive.
2004-03-08 Simon Josefsson <jas@extundo.com> 2004-03-08 Simon Josefsson <jas@extundo.com>

1
libidn/Versions
View File

@ -1,5 +1,6 @@
libcidn { libcidn {
GLIBC_PRIVATE { GLIBC_PRIVATE {
idna_to_ascii_lz; idna_to_ascii_lz;
idna_to_unicode_lzlz;
} }
} }

21
libidn/idna.c
View File

@ -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+3002 (ideographic full stop), U+FF0E (fullwidth full stop),
U+FF61 (halfwidth ideographic 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. */ /* Handle implicit zero-length root label. */
*output = malloc (1); *output = malloc (1);
if (!*output) if (!*output)
return IDNA_MALLOC_ERROR; return IDNA_MALLOC_ERROR;
strcpy (*output, ""); strcpy (*output, input);
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, ".");
return IDNA_SUCCESS; return IDNA_SUCCESS;
#endif
} }
*output = NULL; *output = NULL;