mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 11:20: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.
203 lines
4.2 KiB
C
203 lines
4.2 KiB
C
/* Copyright (C) 2009-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 <errno.h>
|
|
#include <limits.h>
|
|
#include <printf.h>
|
|
#include <stdlib.h>
|
|
#include <wchar.h>
|
|
#include <libc-lock.h>
|
|
|
|
|
|
struct printf_modifier_record
|
|
{
|
|
struct printf_modifier_record *next;
|
|
int bit;
|
|
wchar_t str[0];
|
|
};
|
|
|
|
struct printf_modifier_record **__printf_modifier_table attribute_hidden;
|
|
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
/* Bits to hand out. */
|
|
static int next_bit;
|
|
|
|
|
|
int
|
|
__register_printf_modifier (const wchar_t *str)
|
|
{
|
|
if (str[0] == L'\0')
|
|
{
|
|
einval:
|
|
__set_errno (EINVAL);
|
|
return -1;
|
|
}
|
|
|
|
const wchar_t *wc = str;
|
|
while (*wc != L'\0')
|
|
if (*wc < 0 || *wc > (wchar_t) UCHAR_MAX)
|
|
goto einval;
|
|
else
|
|
++wc;
|
|
|
|
if (next_bit / 8 == sizeof (((struct printf_info *) NULL)->user))
|
|
{
|
|
__set_errno (ENOSPC);
|
|
return -1;
|
|
}
|
|
|
|
int result = -1;
|
|
__libc_lock_lock (lock);
|
|
|
|
if (__printf_modifier_table == NULL)
|
|
{
|
|
__printf_modifier_table = calloc (UCHAR_MAX,
|
|
sizeof (*__printf_modifier_table));
|
|
if (__printf_modifier_table == NULL)
|
|
goto out;
|
|
}
|
|
|
|
/* Create enough room for the string. But we don't need the first
|
|
character. */
|
|
struct printf_modifier_record *newp = malloc (sizeof (*newp)
|
|
+ ((wc - str)
|
|
* sizeof (wchar_t)));
|
|
if (newp == NULL)
|
|
goto out;
|
|
|
|
newp->next = __printf_modifier_table[(unsigned char) *str];
|
|
newp->bit = 1 << next_bit++;
|
|
__wmemcpy (newp->str, str + 1, wc - str);
|
|
|
|
__printf_modifier_table[(unsigned char) *str] = newp;
|
|
|
|
result = newp->bit;
|
|
|
|
out:
|
|
__libc_lock_unlock (lock);
|
|
|
|
return result;
|
|
}
|
|
weak_alias (__register_printf_modifier, register_printf_modifier)
|
|
|
|
|
|
#include <stdio.h>
|
|
int
|
|
attribute_hidden
|
|
__handle_registered_modifier_mb (const unsigned char **format,
|
|
struct printf_info *info)
|
|
{
|
|
struct printf_modifier_record *runp = __printf_modifier_table[**format];
|
|
|
|
int best_bit = 0;
|
|
int best_len = 0;
|
|
const unsigned char *best_cp = NULL;
|
|
|
|
while (runp != NULL)
|
|
{
|
|
const unsigned char *cp = *format + 1;
|
|
wchar_t *fcp = runp->str;
|
|
|
|
while (*cp != '\0' && *fcp != L'\0')
|
|
if (*cp != *fcp)
|
|
break;
|
|
else
|
|
++cp, ++fcp;
|
|
|
|
if (*fcp == L'\0' && cp - *format > best_len)
|
|
{
|
|
best_cp = cp;
|
|
best_len = cp - *format;
|
|
best_bit = runp->bit;
|
|
}
|
|
|
|
runp = runp->next;
|
|
}
|
|
|
|
if (best_bit != 0)
|
|
{
|
|
info->user |= best_bit;
|
|
*format = best_cp;
|
|
return 0;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
|
|
int
|
|
attribute_hidden
|
|
__handle_registered_modifier_wc (const unsigned int **format,
|
|
struct printf_info *info)
|
|
{
|
|
struct printf_modifier_record *runp = __printf_modifier_table[**format];
|
|
|
|
int best_bit = 0;
|
|
int best_len = 0;
|
|
const unsigned int *best_cp = NULL;
|
|
|
|
while (runp != NULL)
|
|
{
|
|
const unsigned int *cp = *format + 1;
|
|
wchar_t *fcp = runp->str;
|
|
|
|
while (*cp != '\0' && *fcp != L'\0')
|
|
if (*cp != *fcp)
|
|
break;
|
|
else
|
|
++cp, ++fcp;
|
|
|
|
if (*fcp == L'\0' && cp - *format > best_len)
|
|
{
|
|
best_cp = cp;
|
|
best_len = cp - *format;
|
|
best_bit = runp->bit;
|
|
}
|
|
|
|
runp = runp->next;
|
|
}
|
|
|
|
if (best_bit != 0)
|
|
{
|
|
info->user |= best_bit;
|
|
*format = best_cp;
|
|
return 0;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
|
|
libc_freeres_fn (free_mem)
|
|
{
|
|
if (__printf_modifier_table != NULL)
|
|
{
|
|
for (int i = 0; i < UCHAR_MAX; ++i)
|
|
{
|
|
struct printf_modifier_record *runp = __printf_modifier_table[i];
|
|
while (runp != NULL)
|
|
{
|
|
struct printf_modifier_record *oldp = runp;
|
|
runp = runp->next;
|
|
free (oldp);
|
|
}
|
|
}
|
|
free (__printf_modifier_table);
|
|
}
|
|
}
|