Implement __idna_to_unicode_lzlz. Split __idna_to_ascii_lz in two parts so that loading can be shared with the new function.

This commit is contained in:
Ulrich Drepper 2004-03-13 06:47:49 +00:00
parent dacf785541
commit 4be2c5fcd8
1 changed files with 74 additions and 30 deletions

View File

@ -33,28 +33,14 @@
static void *h; static void *h;
/* Stub to dlopen libcidn.so and invoke the real idna_to_ascii_lz, or static int (*to_ascii_lz) (const char *input, char **output, int flags);
return IDNA_DLOPEN_ERROR on failure. */ static int (*to_unicode_lzlz) (const char *input, char **output, int flags);
int
__idna_to_ascii_lz (const char *input, char **output, int flags)
static void
load_dso (void)
{ {
/* If the input string contains no non-ASCII character the output /* Lock protecting the DSO loading. */
string will be the same. No valid locale encoding does not have
this property. */
const char *cp = input;
while (*cp != '\0' && isascii (*cp))
++cp;
if (*cp == '\0')
{
*output = strdup (input);
return *output == NULL ? IDNA_MALLOC_ERROR : IDNA_SUCCESS;
}
static int (*to_ascii_lz) (const char *input, char **output, int flags);
if (h == NULL)
{
__libc_lock_define_initialized (static, lock); __libc_lock_define_initialized (static, lock);
__libc_lock_lock (lock); __libc_lock_lock (lock);
@ -70,7 +56,8 @@ __idna_to_ascii_lz (const char *input, char **output, int flags)
{ {
/* Get the function we are interested in. */ /* Get the function we are interested in. */
to_ascii_lz = __libc_dlsym (h, "idna_to_ascii_lz"); to_ascii_lz = __libc_dlsym (h, "idna_to_ascii_lz");
if (to_ascii_lz == NULL) to_unicode_lzlz = __libc_dlsym (h, "idna_to_unicode_lzlz");
if (to_ascii_lz == NULL || to_unicode_lzlz == NULL)
{ {
__libc_dlclose (h); __libc_dlclose (h);
h = (void *) 1l; h = (void *) 1l;
@ -79,8 +66,65 @@ __idna_to_ascii_lz (const char *input, char **output, int flags)
} }
__libc_lock_unlock (lock); __libc_lock_unlock (lock);
}
/* Stub to dlopen libcidn.so and invoke the real idna_to_ascii_lz, or
return IDNA_DLOPEN_ERROR on failure. */
int
__idna_to_unicode_lzlz (const char *input, char **output, int flags)
{
/* If the input string contains no "xn--" prefix for a component of
the name we can pass it up right away. */
const char *cp = input;
while (*cp != '\0')
{
if (strncmp (cp, IDNA_ACE_PREFIX, strlen (IDNA_ACE_PREFIX)) == 0)
break;
/* On to the next part of the name. */
cp = strchrnul (cp, '.');
if (*cp == '.')
++cp;
} }
if (*cp == '\0')
{
*output = (char *) input;
return IDNA_SUCCESS;
}
if (h == NULL)
load_dso ();
if (h == (void *) 1l)
return IDNA_DLOPEN_ERROR;
return to_unicode_lzlz (input, output, flags);
}
/* Stub to dlopen libcidn.so and invoke the real idna_to_ascii_lz, or
return IDNA_DLOPEN_ERROR on failure. */
int
__idna_to_ascii_lz (const char *input, char **output, int flags)
{
/* If the input string contains no non-ASCII character the output
string will be the same. No valid locale encoding does not have
this property. */
const char *cp = input;
while (*cp != '\0' && isascii (*cp))
++cp;
if (*cp == '\0')
{
*output = (char *) input;
return IDNA_SUCCESS;
}
if (h == NULL)
load_dso ();
if (h == (void *) 1l) if (h == (void *) 1l)
return IDNA_DLOPEN_ERROR; return IDNA_DLOPEN_ERROR;