mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
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.
338 lines
8.6 KiB
C
338 lines
8.6 KiB
C
/* Implementation of the bindtextdomain(3) function
|
|
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/>. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <stddef.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "gettextP.h"
|
|
#ifdef _LIBC
|
|
# include <libintl.h>
|
|
#else
|
|
# include "libgnuintl.h"
|
|
#endif
|
|
|
|
/* Handle multi-threaded applications. */
|
|
#ifdef _LIBC
|
|
# include <libc-lock.h>
|
|
# define gl_rwlock_define __libc_rwlock_define
|
|
# define gl_rwlock_wrlock __libc_rwlock_wrlock
|
|
# define gl_rwlock_unlock __libc_rwlock_unlock
|
|
#else
|
|
# include "lock.h"
|
|
#endif
|
|
|
|
/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
|
|
#ifndef offsetof
|
|
# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
|
|
#endif
|
|
|
|
/* @@ end of prolog @@ */
|
|
|
|
/* Lock variable to protect the global data in the gettext implementation. */
|
|
gl_rwlock_define (extern, _nl_state_lock attribute_hidden)
|
|
|
|
|
|
/* Names for the libintl functions are a problem. They must not clash
|
|
with existing names and they should follow ANSI C. But this source
|
|
code is also used in GNU C Library where the names have a __
|
|
prefix. So we have to make a difference here. */
|
|
#ifdef _LIBC
|
|
# define BINDTEXTDOMAIN __bindtextdomain
|
|
# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
|
|
# ifndef strdup
|
|
# define strdup(str) __strdup (str)
|
|
# endif
|
|
#else
|
|
# define BINDTEXTDOMAIN libintl_bindtextdomain
|
|
# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset
|
|
#endif
|
|
|
|
/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
|
|
to be used for the DOMAINNAME message catalog.
|
|
If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
|
|
modified, only the current value is returned.
|
|
If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
|
|
modified nor returned. */
|
|
static void
|
|
set_binding_values (const char *domainname,
|
|
const char **dirnamep, const char **codesetp)
|
|
{
|
|
struct binding *binding;
|
|
int modified;
|
|
|
|
/* Some sanity checks. */
|
|
if (domainname == NULL || domainname[0] == '\0')
|
|
{
|
|
if (dirnamep)
|
|
*dirnamep = NULL;
|
|
if (codesetp)
|
|
*codesetp = NULL;
|
|
return;
|
|
}
|
|
|
|
gl_rwlock_wrlock (_nl_state_lock);
|
|
|
|
modified = 0;
|
|
|
|
for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
|
|
{
|
|
int compare = strcmp (domainname, binding->domainname);
|
|
if (compare == 0)
|
|
/* We found it! */
|
|
break;
|
|
if (compare < 0)
|
|
{
|
|
/* It is not in the list. */
|
|
binding = NULL;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (binding != NULL)
|
|
{
|
|
if (dirnamep)
|
|
{
|
|
const char *dirname = *dirnamep;
|
|
|
|
if (dirname == NULL)
|
|
/* The current binding has be to returned. */
|
|
*dirnamep = binding->dirname;
|
|
else
|
|
{
|
|
/* The domain is already bound. If the new value and the old
|
|
one are equal we simply do nothing. Otherwise replace the
|
|
old binding. */
|
|
char *result = binding->dirname;
|
|
if (strcmp (dirname, result) != 0)
|
|
{
|
|
if (strcmp (dirname, _nl_default_dirname) == 0)
|
|
result = (char *) _nl_default_dirname;
|
|
else
|
|
{
|
|
#if defined _LIBC || defined HAVE_STRDUP
|
|
result = strdup (dirname);
|
|
#else
|
|
size_t len = strlen (dirname) + 1;
|
|
result = (char *) malloc (len);
|
|
if (__builtin_expect (result != NULL, 1))
|
|
memcpy (result, dirname, len);
|
|
#endif
|
|
}
|
|
|
|
if (__builtin_expect (result != NULL, 1))
|
|
{
|
|
if (binding->dirname != _nl_default_dirname)
|
|
free (binding->dirname);
|
|
|
|
binding->dirname = result;
|
|
modified = 1;
|
|
}
|
|
}
|
|
*dirnamep = result;
|
|
}
|
|
}
|
|
|
|
if (codesetp)
|
|
{
|
|
const char *codeset = *codesetp;
|
|
|
|
if (codeset == NULL)
|
|
/* The current binding has be to returned. */
|
|
*codesetp = binding->codeset;
|
|
else
|
|
{
|
|
/* The domain is already bound. If the new value and the old
|
|
one are equal we simply do nothing. Otherwise replace the
|
|
old binding. */
|
|
char *result = binding->codeset;
|
|
if (result == NULL || strcmp (codeset, result) != 0)
|
|
{
|
|
#if defined _LIBC || defined HAVE_STRDUP
|
|
result = strdup (codeset);
|
|
#else
|
|
size_t len = strlen (codeset) + 1;
|
|
result = (char *) malloc (len);
|
|
if (__builtin_expect (result != NULL, 1))
|
|
memcpy (result, codeset, len);
|
|
#endif
|
|
|
|
if (__builtin_expect (result != NULL, 1))
|
|
{
|
|
free (binding->codeset);
|
|
|
|
binding->codeset = result;
|
|
modified = 1;
|
|
}
|
|
}
|
|
*codesetp = result;
|
|
}
|
|
}
|
|
}
|
|
else if ((dirnamep == NULL || *dirnamep == NULL)
|
|
&& (codesetp == NULL || *codesetp == NULL))
|
|
{
|
|
/* Simply return the default values. */
|
|
if (dirnamep)
|
|
*dirnamep = _nl_default_dirname;
|
|
if (codesetp)
|
|
*codesetp = NULL;
|
|
}
|
|
else
|
|
{
|
|
/* We have to create a new binding. */
|
|
size_t len = strlen (domainname) + 1;
|
|
struct binding *new_binding =
|
|
(struct binding *) malloc (offsetof (struct binding, domainname) + len);
|
|
|
|
if (__builtin_expect (new_binding == NULL, 0))
|
|
goto failed;
|
|
|
|
memcpy (new_binding->domainname, domainname, len);
|
|
|
|
if (dirnamep)
|
|
{
|
|
const char *dirname = *dirnamep;
|
|
|
|
if (dirname == NULL)
|
|
/* The default value. */
|
|
dirname = _nl_default_dirname;
|
|
else
|
|
{
|
|
if (strcmp (dirname, _nl_default_dirname) == 0)
|
|
dirname = _nl_default_dirname;
|
|
else
|
|
{
|
|
char *result;
|
|
#if defined _LIBC || defined HAVE_STRDUP
|
|
result = strdup (dirname);
|
|
if (__builtin_expect (result == NULL, 0))
|
|
goto failed_dirname;
|
|
#else
|
|
size_t len = strlen (dirname) + 1;
|
|
result = (char *) malloc (len);
|
|
if (__builtin_expect (result == NULL, 0))
|
|
goto failed_dirname;
|
|
memcpy (result, dirname, len);
|
|
#endif
|
|
dirname = result;
|
|
}
|
|
}
|
|
*dirnamep = dirname;
|
|
new_binding->dirname = (char *) dirname;
|
|
}
|
|
else
|
|
/* The default value. */
|
|
new_binding->dirname = (char *) _nl_default_dirname;
|
|
|
|
if (codesetp)
|
|
{
|
|
const char *codeset = *codesetp;
|
|
|
|
if (codeset != NULL)
|
|
{
|
|
char *result;
|
|
|
|
#if defined _LIBC || defined HAVE_STRDUP
|
|
result = strdup (codeset);
|
|
if (__builtin_expect (result == NULL, 0))
|
|
goto failed_codeset;
|
|
#else
|
|
size_t len = strlen (codeset) + 1;
|
|
result = (char *) malloc (len);
|
|
if (__builtin_expect (result == NULL, 0))
|
|
goto failed_codeset;
|
|
memcpy (result, codeset, len);
|
|
#endif
|
|
codeset = result;
|
|
}
|
|
*codesetp = codeset;
|
|
new_binding->codeset = (char *) codeset;
|
|
}
|
|
else
|
|
new_binding->codeset = NULL;
|
|
|
|
/* Now enqueue it. */
|
|
if (_nl_domain_bindings == NULL
|
|
|| strcmp (domainname, _nl_domain_bindings->domainname) < 0)
|
|
{
|
|
new_binding->next = _nl_domain_bindings;
|
|
_nl_domain_bindings = new_binding;
|
|
}
|
|
else
|
|
{
|
|
binding = _nl_domain_bindings;
|
|
while (binding->next != NULL
|
|
&& strcmp (domainname, binding->next->domainname) > 0)
|
|
binding = binding->next;
|
|
|
|
new_binding->next = binding->next;
|
|
binding->next = new_binding;
|
|
}
|
|
|
|
modified = 1;
|
|
|
|
/* Here we deal with memory allocation failures. */
|
|
if (0)
|
|
{
|
|
failed_codeset:
|
|
if (new_binding->dirname != _nl_default_dirname)
|
|
free (new_binding->dirname);
|
|
failed_dirname:
|
|
free (new_binding);
|
|
failed:
|
|
if (dirnamep)
|
|
*dirnamep = NULL;
|
|
if (codesetp)
|
|
*codesetp = NULL;
|
|
}
|
|
}
|
|
|
|
/* If we modified any binding, we flush the caches. */
|
|
if (modified)
|
|
++_nl_msg_cat_cntr;
|
|
|
|
gl_rwlock_unlock (_nl_state_lock);
|
|
}
|
|
|
|
/* Specify that the DOMAINNAME message catalog will be found
|
|
in DIRNAME rather than in the system locale data base. */
|
|
char *
|
|
BINDTEXTDOMAIN (const char *domainname, const char *dirname)
|
|
{
|
|
set_binding_values (domainname, &dirname, NULL);
|
|
return (char *) dirname;
|
|
}
|
|
|
|
/* Specify the character encoding in which the messages from the
|
|
DOMAINNAME message catalog will be returned. */
|
|
char *
|
|
BIND_TEXTDOMAIN_CODESET (const char *domainname, const char *codeset)
|
|
{
|
|
set_binding_values (domainname, NULL, &codeset);
|
|
return (char *) codeset;
|
|
}
|
|
|
|
#ifdef _LIBC
|
|
/* Aliases for function names in GNU C Library. */
|
|
weak_alias (__bindtextdomain, bindtextdomain);
|
|
weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
|
|
#endif
|