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.
178 lines
5.3 KiB
C
178 lines
5.3 KiB
C
/* Helper functions used by strftime/strptime to handle locale-specific "eras".
|
|
Copyright (C) 1995-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
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, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include "../locale/localeinfo.h"
|
|
#include <libc-lock.h>
|
|
#include <stdlib.h>
|
|
#include <wchar.h>
|
|
#include <string.h>
|
|
#include <stdint.h>
|
|
|
|
/* Some of the functions here must not be used while setlocale is called. */
|
|
__libc_rwlock_define (extern, __libc_setlocale_lock attribute_hidden)
|
|
|
|
#define CURRENT(item) (current->values[_NL_ITEM_INDEX (item)].string)
|
|
#define CURRENT_WORD(item) (current->values[_NL_ITEM_INDEX (item)].word)
|
|
|
|
#define ERA_DATE_CMP(a, b) \
|
|
(a[0] < b[0] || (a[0] == b[0] && (a[1] < b[1] \
|
|
|| (a[1] == b[1] && a[2] <= b[2]))))
|
|
|
|
/* Look up the era information in CURRENT's locale strings and
|
|
cache it in CURRENT->private. */
|
|
static void internal_function
|
|
_nl_init_era_entries (struct __locale_data *current)
|
|
{
|
|
size_t cnt;
|
|
struct lc_time_data *data;
|
|
|
|
/* Avoid touching CURRENT if there is no data at all, for _nl_C_LC_TIME. */
|
|
if (CURRENT_WORD (_NL_TIME_ERA_NUM_ENTRIES) == 0)
|
|
return;
|
|
|
|
__libc_rwlock_wrlock (__libc_setlocale_lock);
|
|
|
|
if (current->private.time == NULL)
|
|
{
|
|
current->private.time = malloc (sizeof *current->private.time);
|
|
if (current->private.time == NULL)
|
|
goto out;
|
|
memset (current->private.time, 0, sizeof *current->private.time);
|
|
current->private.cleanup = &_nl_cleanup_time;
|
|
}
|
|
data = current->private.time;
|
|
|
|
if (! data->era_initialized)
|
|
{
|
|
size_t new_num_eras = CURRENT_WORD (_NL_TIME_ERA_NUM_ENTRIES);
|
|
if (new_num_eras == 0)
|
|
{
|
|
if (data->eras != NULL)
|
|
{
|
|
free (data->eras);
|
|
data->eras = NULL;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
struct era_entry *new_eras = data->eras;
|
|
|
|
if (data->num_eras != new_num_eras)
|
|
new_eras =
|
|
(struct era_entry *) realloc (data->eras,
|
|
new_num_eras
|
|
* sizeof (struct era_entry));
|
|
if (new_eras == NULL)
|
|
{
|
|
free (data->eras);
|
|
data->num_eras = 0;
|
|
data->eras = NULL;
|
|
}
|
|
else
|
|
{
|
|
const char *ptr = CURRENT (_NL_TIME_ERA_ENTRIES);
|
|
data->num_eras = new_num_eras;
|
|
data->eras = new_eras;
|
|
|
|
for (cnt = 0; cnt < new_num_eras; ++cnt)
|
|
{
|
|
const char *base_ptr = ptr;
|
|
memcpy ((void *) (new_eras + cnt), (const void *) ptr,
|
|
sizeof (uint32_t) * 8);
|
|
|
|
if (ERA_DATE_CMP(new_eras[cnt].start_date,
|
|
new_eras[cnt].stop_date))
|
|
if (new_eras[cnt].direction == (uint32_t) '+')
|
|
new_eras[cnt].absolute_direction = 1;
|
|
else
|
|
new_eras[cnt].absolute_direction = -1;
|
|
else
|
|
if (new_eras[cnt].direction == (uint32_t) '+')
|
|
new_eras[cnt].absolute_direction = -1;
|
|
else
|
|
new_eras[cnt].absolute_direction = 1;
|
|
|
|
/* Skip numeric values. */
|
|
ptr += sizeof (uint32_t) * 8;
|
|
|
|
/* Set and skip era name. */
|
|
new_eras[cnt].era_name = ptr;
|
|
ptr = strchr (ptr, '\0') + 1;
|
|
|
|
/* Set and skip era format. */
|
|
new_eras[cnt].era_format = ptr;
|
|
ptr = strchr (ptr, '\0') + 1;
|
|
|
|
ptr += 3 - (((ptr - (const char *) base_ptr) + 3) & 3);
|
|
|
|
/* Set and skip wide era name. */
|
|
new_eras[cnt].era_wname = (wchar_t *) ptr;
|
|
ptr = (char *) (__wcschr ((wchar_t *) ptr, L'\0') + 1);
|
|
|
|
/* Set and skip wide era format. */
|
|
new_eras[cnt].era_wformat = (wchar_t *) ptr;
|
|
ptr = (char *) (__wcschr ((wchar_t *) ptr, L'\0') + 1);
|
|
}
|
|
}
|
|
}
|
|
|
|
data->era_initialized = 1;
|
|
}
|
|
|
|
out:
|
|
__libc_rwlock_unlock (__libc_setlocale_lock);
|
|
}
|
|
|
|
struct era_entry *
|
|
internal_function
|
|
_nl_get_era_entry (const struct tm *tp, struct __locale_data *current)
|
|
{
|
|
if (current->private.time == NULL || !current->private.time->era_initialized)
|
|
_nl_init_era_entries (current);
|
|
|
|
if (current->private.time != NULL)
|
|
{
|
|
/* Now compare date with the available eras. */
|
|
const int32_t tdate[3] = { tp->tm_year, tp->tm_mon, tp->tm_mday };
|
|
size_t cnt;
|
|
for (cnt = 0; cnt < current->private.time->num_eras; ++cnt)
|
|
if ((ERA_DATE_CMP (current->private.time->eras[cnt].start_date, tdate)
|
|
&& ERA_DATE_CMP (tdate,
|
|
current->private.time->eras[cnt].stop_date))
|
|
|| (ERA_DATE_CMP (current->private.time->eras[cnt].stop_date,
|
|
tdate)
|
|
&& ERA_DATE_CMP (tdate,
|
|
current->private.time->eras[cnt].start_date)))
|
|
return ¤t->private.time->eras[cnt];
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
|
|
struct era_entry *
|
|
internal_function
|
|
_nl_select_era_entry (int cnt, struct __locale_data *current)
|
|
{
|
|
if (current->private.time == NULL || !current->private.time->era_initialized)
|
|
_nl_init_era_entries (current);
|
|
|
|
return (current->private.time == NULL
|
|
? NULL : ¤t->private.time->eras[cnt]);
|
|
}
|