mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-31 22:10:34 +03:00 
			
		
		
		
	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.
		
			
				
	
	
		
			211 lines
		
	
	
		
			5.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			211 lines
		
	
	
		
			5.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* Handle list of needed message catalogs
 | |
|    Copyright (C) 1995-2015 Free Software Foundation, Inc.
 | |
|    Written by Ulrich Drepper <drepper@gnu.org>, 1995.
 | |
| 
 | |
|    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 <stdio.h>
 | |
| #include <sys/types.h>
 | |
| #include <stdlib.h>
 | |
| #include <string.h>
 | |
| 
 | |
| #if defined HAVE_UNISTD_H || defined _LIBC
 | |
| # include <unistd.h>
 | |
| #endif
 | |
| 
 | |
| #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_initialized __libc_rwlock_define_initialized
 | |
| # define gl_rwlock_rdlock __libc_rwlock_rdlock
 | |
| # define gl_rwlock_wrlock __libc_rwlock_wrlock
 | |
| # define gl_rwlock_unlock __libc_rwlock_unlock
 | |
| #else
 | |
| # include "lock.h"
 | |
| #endif
 | |
| 
 | |
| /* @@ end of prolog @@ */
 | |
| /* List of already loaded domains.  */
 | |
| static struct loaded_l10nfile *_nl_loaded_domains;
 | |
| 
 | |
| 
 | |
| /* Return a data structure describing the message catalog described by
 | |
|    the DOMAINNAME and CATEGORY parameters with respect to the currently
 | |
|    established bindings.  */
 | |
| struct loaded_l10nfile *
 | |
| internal_function
 | |
| _nl_find_domain (const char *dirname, char *locale,
 | |
| 		 const char *domainname, struct binding *domainbinding)
 | |
| {
 | |
|   struct loaded_l10nfile *retval;
 | |
|   const char *language;
 | |
|   const char *modifier;
 | |
|   const char *territory;
 | |
|   const char *codeset;
 | |
|   const char *normalized_codeset;
 | |
|   const char *alias_value;
 | |
|   int mask;
 | |
| 
 | |
|   /* LOCALE can consist of up to four recognized parts for the XPG syntax:
 | |
| 
 | |
| 		language[_territory][.codeset][@modifier]
 | |
| 
 | |
|      Beside the first part all of them are allowed to be missing.  If
 | |
|      the full specified locale is not found, the less specific one are
 | |
|      looked for.  The various parts will be stripped off according to
 | |
|      the following order:
 | |
| 		(1) codeset
 | |
| 		(2) normalized codeset
 | |
| 		(3) territory
 | |
| 		(4) modifier
 | |
|    */
 | |
| 
 | |
|   /* We need to protect modifying the _NL_LOADED_DOMAINS data.  */
 | |
|   gl_rwlock_define_initialized (static, lock);
 | |
|   gl_rwlock_rdlock (lock);
 | |
| 
 | |
|   /* If we have already tested for this locale entry there has to
 | |
|      be one data set in the list of loaded domains.  */
 | |
|   retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
 | |
| 			       strlen (dirname) + 1, 0, locale, NULL, NULL,
 | |
| 			       NULL, NULL, domainname, 0);
 | |
| 
 | |
|   gl_rwlock_unlock (lock);
 | |
| 
 | |
|   if (retval != NULL)
 | |
|     {
 | |
|       /* We know something about this locale.  */
 | |
|       int cnt;
 | |
| 
 | |
|       if (retval->decided <= 0)
 | |
| 	_nl_load_domain (retval, domainbinding);
 | |
| 
 | |
|       if (retval->data != NULL)
 | |
| 	return retval;
 | |
| 
 | |
|       for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
 | |
| 	{
 | |
| 	  if (retval->successor[cnt]->decided <= 0)
 | |
| 	    _nl_load_domain (retval->successor[cnt], domainbinding);
 | |
| 
 | |
| 	  if (retval->successor[cnt]->data != NULL)
 | |
| 	    break;
 | |
| 	}
 | |
| 
 | |
|       return retval;
 | |
|       /* NOTREACHED */
 | |
|     }
 | |
| 
 | |
|   /* See whether the locale value is an alias.  If yes its value
 | |
|      *overwrites* the alias name.  No test for the original value is
 | |
|      done.  */
 | |
|   alias_value = _nl_expand_alias (locale);
 | |
|   if (alias_value != NULL)
 | |
|     {
 | |
| #if defined _LIBC || defined HAVE_STRDUP
 | |
|       locale = strdup (alias_value);
 | |
|       if (locale == NULL)
 | |
| 	return NULL;
 | |
| #else
 | |
|       size_t len = strlen (alias_value) + 1;
 | |
|       locale = (char *) malloc (len);
 | |
|       if (locale == NULL)
 | |
| 	return NULL;
 | |
| 
 | |
|       memcpy (locale, alias_value, len);
 | |
| #endif
 | |
|     }
 | |
| 
 | |
|   /* Now we determine the single parts of the locale name.  First
 | |
|      look for the language.  Termination symbols are `_', '.', and `@'.  */
 | |
|   mask = _nl_explode_name (locale, &language, &modifier, &territory,
 | |
| 			   &codeset, &normalized_codeset);
 | |
|   if (mask == -1)
 | |
|     /* This means we are out of core.  */
 | |
|     return NULL;
 | |
| 
 | |
|   /* We need to protect modifying the _NL_LOADED_DOMAINS data.  */
 | |
|   gl_rwlock_wrlock (lock);
 | |
| 
 | |
|   /* Create all possible locale entries which might be interested in
 | |
|      generalization.  */
 | |
|   retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
 | |
| 			       strlen (dirname) + 1, mask, language, territory,
 | |
| 			       codeset, normalized_codeset, modifier,
 | |
| 			       domainname, 1);
 | |
| 
 | |
|   gl_rwlock_unlock (lock);
 | |
| 
 | |
|   if (retval == NULL)
 | |
|     /* This means we are out of core.  */
 | |
|     goto out;
 | |
| 
 | |
|   if (retval->decided <= 0)
 | |
|     _nl_load_domain (retval, domainbinding);
 | |
|   if (retval->data == NULL)
 | |
|     {
 | |
|       int cnt;
 | |
|       for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
 | |
| 	{
 | |
| 	  if (retval->successor[cnt]->decided <= 0)
 | |
| 	    _nl_load_domain (retval->successor[cnt], domainbinding);
 | |
| 	  if (retval->successor[cnt]->data != NULL)
 | |
| 	    break;
 | |
| 	}
 | |
|     }
 | |
| 
 | |
|   /* The room for an alias was dynamically allocated.  Free it now.  */
 | |
|   if (alias_value != NULL)
 | |
|     free (locale);
 | |
| 
 | |
| out:
 | |
|   /* The space for normalized_codeset is dynamically allocated.  Free it.  */
 | |
|   if (mask & XPG_NORM_CODESET)
 | |
|     free ((void *) normalized_codeset);
 | |
| 
 | |
|   return retval;
 | |
| }
 | |
| 
 | |
| 
 | |
| #ifdef _LIBC
 | |
| /* This is called from iconv/gconv_db.c's free_mem, as locales must
 | |
|    be freed before freeing gconv steps arrays.  */
 | |
| void __libc_freeres_fn_section
 | |
| _nl_finddomain_subfreeres (void)
 | |
| {
 | |
|   struct loaded_l10nfile *runp = _nl_loaded_domains;
 | |
| 
 | |
|   while (runp != NULL)
 | |
|     {
 | |
|       struct loaded_l10nfile *here = runp;
 | |
|       if (runp->data != NULL)
 | |
| 	_nl_unload_domain ((struct loaded_domain *) runp->data);
 | |
|       runp = runp->next;
 | |
|       free ((char *) here->filename);
 | |
|       free (here);
 | |
|     }
 | |
| }
 | |
| #endif
 |