ec999b8e5e
It was noted in <https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> that the bits/*.h naming scheme should only be used for installed headers. This patch renames bits/libc-lock.h to plain libc-lock.h and bits/libc-lockP.h to plain libc-lockP.h to follow that convention. Note that I don't know where libc-lockP.h comes from for Hurd (the Hurd libc-lock.h includes libc-lockP.h, but the only libc-lockP.h in the glibc source tree is for NPTL) - some unmerged patch? - but I updated the #include in the Hurd libc-lock.h anyway. Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by the patch). [BZ #14912] * bits/libc-lock.h: Move to ... * sysdeps/generic/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/mach/hurd/bits/libc-lock.h: Move to ... * sysdeps/mach/hurd/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. [_LIBC]: Include <libc-lockP.h> instead of <bits/libc-lockP.h>. * sysdeps/mach/bits/libc-lock.h: Move to ... * sysdeps/mach/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lock.h: Move to ... * sysdeps/nptl/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lockP.h: Move to ... * sysdeps/nptl/libc-lockP.h: ...here. (_BITS_LIBC_LOCKP_H): Rename macro to _LIBC_LOCKP_H. * crypt/crypt_util.c: Include <libc-lock.h> instead of <bits/libc-lock.h>. * dirent/scandir-tail.c: Likewise. * dlfcn/dlerror.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-writev.h: Likewise. * elf/rtld.c: Likewise. * grp/fgetgrent.c: Likewise. * gshadow/fgetsgent.c: Likewise. * gshadow/sgetsgent.c: Likewise. * iconv/gconv_conf.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_trans.c: Likewise. * include/link.h: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent.c: Likewise. * inet/getnetgrent_r.c: Likewise. * intl/bindtextdom.c: Likewise. * intl/dcigettext.c: Likewise. * intl/finddomain.c: Likewise. * intl/gettextP.h: Likewise. * intl/loadmsgcat.c: Likewise. * intl/localealias.c: Likewise. * intl/textdomain.c: Likewise. * libidn/idn-stub.c: Likewise. * libio/libioP.h: Likewise. * locale/duplocale.c: Likewise. * locale/freelocale.c: Likewise. * locale/newlocale.c: Likewise. * locale/setlocale.c: Likewise. * login/getutent_r.c: Likewise. * login/getutid_r.c: Likewise. * login/getutline_r.c: Likewise. * login/utmp-private.h: Likewise. * login/utmpname.c: Likewise. * malloc/mtrace.c: Likewise. * misc/efgcvt.c: Likewise. * misc/error.c: Likewise. * misc/fstab.c: Likewise. * misc/getpass.c: Likewise. * misc/mntent.c: Likewise. * misc/syslog.c: Likewise. * nis/nis_call.c: Likewise. * nis/nis_callback.c: Likewise. * nis/nss-default.c: Likewise. * nis/nss_compat/compat-grp.c: Likewise. * nis/nss_compat/compat-initgroups.c: Likewise. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/nss_nisplus/nisplus-alias.c: Likewise. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-initgroups.c: Likewise. * nis/nss_nisplus/nisplus-network.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * nis/ypclnt.c: Likewise. * nptl/libc_pthread_init.c: Likewise. * nss/getXXbyYY.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/nss_db/db-XXX.c: Likewise. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_db/nss_db.h: Likewise. * nss/nss_files/files-XXX.c: Likewise. * nss/nss_files/files-alias.c: Likewise. * nss/nsswitch.c: Likewise. * posix/regex_internal.h: Likewise. * posix/wordexp.c: Likewise. * pwd/fgetpwent.c: Likewise. * resolv/res_hconf.c: Likewise. * resolv/res_libc.c: Likewise. * shadow/fgetspent.c: Likewise. * shadow/lckpwdf.c: Likewise. * shadow/sgetspent.c: Likewise. * socket/opensock.c: Likewise. * stdio-common/reg-modifier.c: Likewise. * stdio-common/reg-printf.c: Likewise. * stdio-common/reg-type.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/abort.c: Likewise. * stdlib/cxa_atexit.c: Likewise. * stdlib/fmtmsg.c: Likewise. * stdlib/random.c: Likewise. * stdlib/setenv.c: Likewise. * string/strsignal.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/create_xid.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/rpc_thread.c: Likewise. * sysdeps/arm/backtrace.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/stdio-lock.h: Likewise. * sysdeps/generic/unwind-dw2-fde.c: Likewise. * sysdeps/i386/backtrace.c: Likewise. * sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Likewise. * sysdeps/m68k/backtrace.c: Likewise. * sysdeps/mach/hurd/cthreads.c: Likewise. * sysdeps/mach/hurd/dirstream.h: Likewise. * sysdeps/mach/hurd/malloc-machine.h: Likewise. * sysdeps/nptl/malloc-machine.h: Likewise. * sysdeps/nptl/stdio-lock.h: Likewise. * sysdeps/posix/dirstream.h: Likewise. * sysdeps/posix/getaddrinfo.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/pthread/aio_suspend.c: Likewise. * sysdeps/s390/s390-32/backtrace.c: Likewise. * sysdeps/s390/s390-64/backtrace.c: Likewise. * sysdeps/unix/sysv/linux/check_pf.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c: Likewise. * sysdeps/unix/sysv/linux/shm-directory.c: Likewise. * sysdeps/unix/sysv/linux/system.c: Likewise. * sysdeps/x86_64/backtrace.c: Likewise. * time/alt_digit.c: Likewise. * time/era.c: Likewise. * time/tzset.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * nptl/tst-initializers1.c (do_test): Refer to <libc-lock.h> instead of <bits/libc-lock.h> in comment.
438 lines
10 KiB
C
438 lines
10 KiB
C
/* Handle aliases for locale names.
|
|
Copyright (C) 1995-2015 Free Software Foundation, Inc.
|
|
|
|
This program 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.
|
|
|
|
This program 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 this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
/* Tell glibc's <string.h> to provide a prototype for mempcpy().
|
|
This must come before <config.h> because <config.h> may include
|
|
<features.h>, and once <features.h> has been included, it's too late. */
|
|
#ifndef _GNU_SOURCE
|
|
# define _GNU_SOURCE 1
|
|
#endif
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <ctype.h>
|
|
#include <stdio.h>
|
|
#if defined _LIBC || defined HAVE___FSETLOCKING
|
|
# include <stdio_ext.h>
|
|
#endif
|
|
#include <sys/types.h>
|
|
|
|
#ifdef __GNUC__
|
|
# undef alloca
|
|
# define alloca __builtin_alloca
|
|
# define HAVE_ALLOCA 1
|
|
#else
|
|
# ifdef _MSC_VER
|
|
# include <malloc.h>
|
|
# define alloca _alloca
|
|
# else
|
|
# if defined HAVE_ALLOCA_H || defined _LIBC
|
|
# include <alloca.h>
|
|
# else
|
|
# ifdef _AIX
|
|
#pragma alloca
|
|
# else
|
|
# ifndef alloca
|
|
char *alloca ();
|
|
# endif
|
|
# endif
|
|
# endif
|
|
# endif
|
|
#endif
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "gettextP.h"
|
|
|
|
#ifdef ENABLE_RELOCATABLE
|
|
# include "relocatable.h"
|
|
#else
|
|
# define relocate(pathname) (pathname)
|
|
#endif
|
|
|
|
/* @@ end of prolog @@ */
|
|
|
|
#ifdef _LIBC
|
|
/* Rename the non ANSI C functions. This is required by the standard
|
|
because some ANSI C functions will require linking with this object
|
|
file and the name space must not be polluted. */
|
|
# define strcasecmp(s1, s2) __strcasecmp_l (s1, s2, _nl_C_locobj_ptr)
|
|
|
|
# ifndef mempcpy
|
|
# define mempcpy __mempcpy
|
|
# endif
|
|
# define HAVE_MEMPCPY 1
|
|
# define HAVE___FSETLOCKING 1
|
|
#endif
|
|
|
|
/* Handle multi-threaded applications. */
|
|
#ifdef _LIBC
|
|
# include <libc-lock.h>
|
|
#else
|
|
# include "lock.h"
|
|
#endif
|
|
|
|
#ifndef internal_function
|
|
# define internal_function
|
|
#endif
|
|
|
|
/* Some optimizations for glibc. */
|
|
#ifdef _LIBC
|
|
# define FEOF(fp) feof_unlocked (fp)
|
|
# define FGETS(buf, n, fp) __fgets_unlocked (buf, n, fp)
|
|
#else
|
|
# define FEOF(fp) feof (fp)
|
|
# define FGETS(buf, n, fp) fgets (buf, n, fp)
|
|
#endif
|
|
|
|
/* For those losing systems which don't have `alloca' we have to add
|
|
some additional code emulating it. */
|
|
#ifdef HAVE_ALLOCA
|
|
# define freea(p) /* nothing */
|
|
#else
|
|
# define alloca(n) malloc (n)
|
|
# define freea(p) free (p)
|
|
#endif
|
|
|
|
#if defined _LIBC_REENTRANT || defined HAVE_DECL_FGETS_UNLOCKED
|
|
# undef fgets
|
|
# define fgets(buf, len, s) fgets_unlocked (buf, len, s)
|
|
#endif
|
|
#if defined _LIBC_REENTRANT || defined HAVE_DECL_FEOF_UNLOCKED
|
|
# undef feof
|
|
# define feof(s) feof_unlocked (s)
|
|
#endif
|
|
|
|
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
|
|
struct alias_map
|
|
{
|
|
const char *alias;
|
|
const char *value;
|
|
};
|
|
|
|
|
|
#ifndef _LIBC
|
|
# define libc_freeres_ptr(decl) decl
|
|
#endif
|
|
|
|
libc_freeres_ptr (static char *string_space);
|
|
static size_t string_space_act;
|
|
static size_t string_space_max;
|
|
libc_freeres_ptr (static struct alias_map *map);
|
|
static size_t nmap;
|
|
static size_t maxmap;
|
|
|
|
|
|
/* Prototypes for local functions. */
|
|
static size_t read_alias_file (const char *fname, int fname_len)
|
|
internal_function;
|
|
static int extend_alias_table (void);
|
|
static int alias_compare (const struct alias_map *map1,
|
|
const struct alias_map *map2);
|
|
|
|
|
|
const char *
|
|
_nl_expand_alias (const char *name)
|
|
{
|
|
static const char *locale_alias_path;
|
|
struct alias_map *retval;
|
|
const char *result = NULL;
|
|
size_t added;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
if (locale_alias_path == NULL)
|
|
locale_alias_path = LOCALE_ALIAS_PATH;
|
|
|
|
do
|
|
{
|
|
struct alias_map item;
|
|
|
|
item.alias = name;
|
|
|
|
if (nmap > 0)
|
|
retval = (struct alias_map *) bsearch (&item, map, nmap,
|
|
sizeof (struct alias_map),
|
|
(int (*) (const void *,
|
|
const void *)
|
|
) alias_compare);
|
|
else
|
|
retval = NULL;
|
|
|
|
/* We really found an alias. Return the value. */
|
|
if (retval != NULL)
|
|
{
|
|
result = retval->value;
|
|
break;
|
|
}
|
|
|
|
/* Perhaps we can find another alias file. */
|
|
added = 0;
|
|
while (added == 0 && locale_alias_path[0] != '\0')
|
|
{
|
|
const char *start;
|
|
|
|
while (locale_alias_path[0] == PATH_SEPARATOR)
|
|
++locale_alias_path;
|
|
start = locale_alias_path;
|
|
|
|
while (locale_alias_path[0] != '\0'
|
|
&& locale_alias_path[0] != PATH_SEPARATOR)
|
|
++locale_alias_path;
|
|
|
|
if (start < locale_alias_path)
|
|
added = read_alias_file (start, locale_alias_path - start);
|
|
}
|
|
}
|
|
while (added != 0);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static size_t
|
|
internal_function
|
|
read_alias_file (const char *fname, int fname_len)
|
|
{
|
|
FILE *fp;
|
|
char *full_fname;
|
|
size_t added;
|
|
static const char aliasfile[] = "/locale.alias";
|
|
|
|
full_fname = (char *) alloca (fname_len + sizeof aliasfile);
|
|
#ifdef HAVE_MEMPCPY
|
|
mempcpy (mempcpy (full_fname, fname, fname_len),
|
|
aliasfile, sizeof aliasfile);
|
|
#else
|
|
memcpy (full_fname, fname, fname_len);
|
|
memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
|
|
#endif
|
|
|
|
#ifdef _LIBC
|
|
/* Note the file is opened with cancellation in the I/O functions
|
|
disabled. */
|
|
fp = fopen (relocate (full_fname), "rce");
|
|
#else
|
|
fp = fopen (relocate (full_fname), "r");
|
|
#endif
|
|
freea (full_fname);
|
|
if (fp == NULL)
|
|
return 0;
|
|
|
|
#ifdef HAVE___FSETLOCKING
|
|
/* No threads present. */
|
|
__fsetlocking (fp, FSETLOCKING_BYCALLER);
|
|
#endif
|
|
|
|
added = 0;
|
|
while (!FEOF (fp))
|
|
{
|
|
/* It is a reasonable approach to use a fix buffer here because
|
|
a) we are only interested in the first two fields
|
|
b) these fields must be usable as file names and so must not
|
|
be that long
|
|
We avoid a multi-kilobyte buffer here since this would use up
|
|
stack space which we might not have if the program ran out of
|
|
memory. */
|
|
char buf[400];
|
|
char *alias;
|
|
char *value;
|
|
char *cp;
|
|
int complete_line;
|
|
|
|
if (FGETS (buf, sizeof buf, fp) == NULL)
|
|
/* EOF reached. */
|
|
break;
|
|
|
|
/* Determine whether the line is complete. */
|
|
complete_line = strchr (buf, '\n') != NULL;
|
|
|
|
cp = buf;
|
|
/* Ignore leading white space. */
|
|
while (isspace ((unsigned char) cp[0]))
|
|
++cp;
|
|
|
|
/* A leading '#' signals a comment line. */
|
|
if (cp[0] != '\0' && cp[0] != '#')
|
|
{
|
|
alias = cp++;
|
|
while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
|
|
++cp;
|
|
/* Terminate alias name. */
|
|
if (cp[0] != '\0')
|
|
*cp++ = '\0';
|
|
|
|
/* Now look for the beginning of the value. */
|
|
while (isspace ((unsigned char) cp[0]))
|
|
++cp;
|
|
|
|
if (cp[0] != '\0')
|
|
{
|
|
value = cp++;
|
|
while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
|
|
++cp;
|
|
/* Terminate value. */
|
|
if (cp[0] == '\n')
|
|
{
|
|
/* This has to be done to make the following test
|
|
for the end of line possible. We are looking for
|
|
the terminating '\n' which do not overwrite here. */
|
|
*cp++ = '\0';
|
|
*cp = '\n';
|
|
}
|
|
else if (cp[0] != '\0')
|
|
*cp++ = '\0';
|
|
|
|
#ifdef IN_LIBGLOCALE
|
|
/* glibc's locale.alias contains entries for ja_JP and ko_KR
|
|
that make it impossible to use a Japanese or Korean UTF-8
|
|
locale under the name "ja_JP" or "ko_KR". Ignore these
|
|
entries. */
|
|
if (strchr (alias, '_') == NULL)
|
|
#endif
|
|
{
|
|
size_t alias_len;
|
|
size_t value_len;
|
|
|
|
if (nmap >= maxmap)
|
|
if (__builtin_expect (extend_alias_table (), 0))
|
|
goto out;
|
|
|
|
alias_len = strlen (alias) + 1;
|
|
value_len = strlen (value) + 1;
|
|
|
|
if (string_space_act + alias_len + value_len > string_space_max)
|
|
{
|
|
/* Increase size of memory pool. */
|
|
size_t new_size = (string_space_max
|
|
+ (alias_len + value_len > 1024
|
|
? alias_len + value_len : 1024));
|
|
char *new_pool = (char *) realloc (string_space, new_size);
|
|
if (new_pool == NULL)
|
|
goto out;
|
|
|
|
if (__builtin_expect (string_space != new_pool, 0))
|
|
{
|
|
size_t i;
|
|
|
|
for (i = 0; i < nmap; i++)
|
|
{
|
|
map[i].alias += new_pool - string_space;
|
|
map[i].value += new_pool - string_space;
|
|
}
|
|
}
|
|
|
|
string_space = new_pool;
|
|
string_space_max = new_size;
|
|
}
|
|
|
|
map[nmap].alias =
|
|
(const char *) memcpy (&string_space[string_space_act],
|
|
alias, alias_len);
|
|
string_space_act += alias_len;
|
|
|
|
map[nmap].value =
|
|
(const char *) memcpy (&string_space[string_space_act],
|
|
value, value_len);
|
|
string_space_act += value_len;
|
|
|
|
++nmap;
|
|
++added;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Possibly not the whole line fits into the buffer. Ignore
|
|
the rest of the line. */
|
|
if (! complete_line)
|
|
do
|
|
if (FGETS (buf, sizeof buf, fp) == NULL)
|
|
/* Make sure the inner loop will be left. The outer loop
|
|
will exit at the `feof' test. */
|
|
break;
|
|
while (strchr (buf, '\n') == NULL);
|
|
}
|
|
|
|
out:
|
|
/* Should we test for ferror()? I think we have to silently ignore
|
|
errors. --drepper */
|
|
fclose (fp);
|
|
|
|
if (added > 0)
|
|
qsort (map, nmap, sizeof (struct alias_map),
|
|
(int (*) (const void *, const void *)) alias_compare);
|
|
|
|
return added;
|
|
}
|
|
|
|
|
|
static int
|
|
extend_alias_table (void)
|
|
{
|
|
size_t new_size;
|
|
struct alias_map *new_map;
|
|
|
|
new_size = maxmap == 0 ? 100 : 2 * maxmap;
|
|
new_map = (struct alias_map *) realloc (map, (new_size
|
|
* sizeof (struct alias_map)));
|
|
if (new_map == NULL)
|
|
/* Simply don't extend: we don't have any more core. */
|
|
return -1;
|
|
|
|
map = new_map;
|
|
maxmap = new_size;
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int
|
|
alias_compare (const struct alias_map *map1, const struct alias_map *map2)
|
|
{
|
|
#if defined _LIBC || defined HAVE_STRCASECMP
|
|
return strcasecmp (map1->alias, map2->alias);
|
|
#else
|
|
const unsigned char *p1 = (const unsigned char *) map1->alias;
|
|
const unsigned char *p2 = (const unsigned char *) map2->alias;
|
|
unsigned char c1, c2;
|
|
|
|
if (p1 == p2)
|
|
return 0;
|
|
|
|
do
|
|
{
|
|
/* I know this seems to be odd but the tolower() function in
|
|
some systems libc cannot handle nonalpha characters. */
|
|
c1 = isupper (*p1) ? tolower (*p1) : *p1;
|
|
c2 = isupper (*p2) ? tolower (*p2) : *p2;
|
|
if (c1 == '\0')
|
|
break;
|
|
++p1;
|
|
++p2;
|
|
}
|
|
while (c1 == c2);
|
|
|
|
return c1 - c2;
|
|
#endif
|
|
}
|