mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-12 06:10:10 +00:00
1c298d0887
2007-07-12 Jakub Jelinek <jakub@redhat.com> [BZ #4775] * math/tgmath.h (__tgmath_real_type_sub): Formatting. (__tgmath_real_type): Fix if expr is const int or other const qualified integral type. (__TGMATH_UNARY_REAL_ONLY): Rewritten to avoid using statement expressions and handle const qualified arguments. (__TGMATH_BINARY_FIRST_REAL_ONLY, __TGMATH_UNARY_REAL_IMAG, __TGMATH_UNARY_REAL_IMAG_RET_REAL): Likewise. (__TGMATH_UNARY_REAL_RET_ONLY): Rewritten to avoid using statement expressions. (__TGMATH_BINARY_REAL_ONLY, __TGMATH_TERNARY_FIRST_SECOND_REAL_ONLY, __TGMATH_TERNARY_REAL_ONLY, __TGMATH_BINARY_REAL_IMAG): Likewise. (__TGMATH_UNARY_IMAG): Define. (conj, cproj): Use __TGMATH_UNARY_IMAG macro. * math/Makefile (tests): Add test-tgmath2. (CFLAGS-test-tgmath2.c): Add. * math/test-tgmath.c (fy, dy, ly, fz, dz, lz, count_cdouble, count_cfloat, count_cldouble): New variables. (NCCALLS): Define. (main): Check number of complex calls as well. (F(compile_test)): Add complex tests and tests with const qualified arguments. (y, z, ccount): Define. (F(cacos), F(casin), F(catan), F(ccos), F(csin), F(ctan), F(cacosh), F(casinh), F(catanh), F(ccosh), F(csinh), F(ctanh), F(cexp), F(clog), F(csqrt), F(cpow), F(cabs), F(carg), F(creal), F(cimag), F(conj), F(cproj)): New functions. * math/test-tgmath2.c: New test. 2007-07-11 Jakub Jelinek <jakub@redhat.com> [BZ #4776] * elf/dl-load.c (_dl_rtld_di_serinfo): Output / in LD_LIBRARY_PATH, RPATH etc. as "/" rather than "", don't segfault on empty paths, instead output ".". * dlfcn/Makefile (distribute): Add glreflib3.c. (module-names): Add glreflib3. ($(objpfx)tst-dlinfo.out): Depend on glreflib3.so rather than glreflib1.so. (LDFLAGS_glreflib3.so): New. * dlfcn/tst-dlinfo.c (do_test): Load glreflib3.so instead of glreflib1.so. * dlfcn/glreflib3.c: New file. * intl/finddomain.c (_nl_find_domain): If _nl_explode_name returned -1, return NULL. * intl/explodename.c (_nl_explode_name): Return -1 if _nl_normalize_codeset failed.
139 lines
3.4 KiB
C
139 lines
3.4 KiB
C
/* Copyright (C) 1995-2002, 2003, 2006, 2007 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
|
|
#include "loadinfo.h"
|
|
|
|
/* On some strange systems still no definition of NULL is found. Sigh! */
|
|
#ifndef NULL
|
|
# if defined __STDC__ && __STDC__
|
|
# define NULL ((void *) 0)
|
|
# else
|
|
# define NULL 0
|
|
# endif
|
|
#endif
|
|
|
|
/* @@ end of prolog @@ */
|
|
|
|
static char *_nl_find_language PARAMS ((const char *name));
|
|
|
|
static char *
|
|
_nl_find_language (name)
|
|
const char *name;
|
|
{
|
|
while (name[0] != '\0' && name[0] != '_' && name[0] != '@' && name[0] != '.')
|
|
++name;
|
|
|
|
return (char *) name;
|
|
}
|
|
|
|
|
|
int
|
|
_nl_explode_name (name, language, modifier, territory, codeset,
|
|
normalized_codeset)
|
|
char *name;
|
|
const char **language;
|
|
const char **modifier;
|
|
const char **territory;
|
|
const char **codeset;
|
|
const char **normalized_codeset;
|
|
{
|
|
char *cp;
|
|
int mask;
|
|
|
|
*modifier = NULL;
|
|
*territory = NULL;
|
|
*codeset = NULL;
|
|
*normalized_codeset = NULL;
|
|
|
|
/* Now we determine the single parts of the locale name. First
|
|
look for the language. Termination symbols are `_', '.', and `@'. */
|
|
mask = 0;
|
|
*language = cp = name;
|
|
cp = _nl_find_language (*language);
|
|
|
|
if (*language == cp)
|
|
/* This does not make sense: language has to be specified. Use
|
|
this entry as it is without exploding. Perhaps it is an alias. */
|
|
cp = __rawmemchr (*language, '\0');
|
|
else if (cp[0] != '@')
|
|
{
|
|
if (cp[0] == '_')
|
|
{
|
|
/* Next is the territory. */
|
|
cp[0] = '\0';
|
|
*territory = ++cp;
|
|
|
|
while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@')
|
|
++cp;
|
|
|
|
mask |= XPG_TERRITORY;
|
|
}
|
|
|
|
if (cp[0] == '.')
|
|
{
|
|
/* Next is the codeset. */
|
|
cp[0] = '\0';
|
|
*codeset = ++cp;
|
|
|
|
while (cp[0] != '\0' && cp[0] != '@')
|
|
++cp;
|
|
|
|
mask |= XPG_CODESET;
|
|
|
|
if (*codeset != cp && (*codeset)[0] != '\0')
|
|
{
|
|
*normalized_codeset = _nl_normalize_codeset (*codeset,
|
|
cp - *codeset);
|
|
if (*normalized_codeset == NULL)
|
|
return -1;
|
|
else if (strcmp (*codeset, *normalized_codeset) == 0)
|
|
free ((char *) *normalized_codeset);
|
|
else
|
|
mask |= XPG_NORM_CODESET;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (cp[0] == '@')
|
|
{
|
|
/* Next is the modifier. */
|
|
cp[0] = '\0';
|
|
*modifier = ++cp;
|
|
|
|
if (cp[0] != '\0')
|
|
mask |= XPG_MODIFIER;
|
|
}
|
|
|
|
if (*territory != NULL && (*territory)[0] == '\0')
|
|
mask &= ~XPG_TERRITORY;
|
|
|
|
if (*codeset != NULL && (*codeset)[0] == '\0')
|
|
mask &= ~XPG_CODESET;
|
|
|
|
return mask;
|
|
}
|