mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 19:00: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.
240 lines
7.0 KiB
C
240 lines
7.0 KiB
C
/* Transliteration using the locale's data.
|
|
Copyright (C) 2000-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000.
|
|
|
|
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 <assert.h>
|
|
#include <dlfcn.h>
|
|
#include <search.h>
|
|
#include <stdint.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
|
|
#include <libc-lock.h>
|
|
#include "gconv_int.h"
|
|
#include "../locale/localeinfo.h"
|
|
|
|
|
|
int
|
|
__gconv_transliterate (struct __gconv_step *step,
|
|
struct __gconv_step_data *step_data,
|
|
const unsigned char *inbufstart,
|
|
const unsigned char **inbufp,
|
|
const unsigned char *inbufend,
|
|
unsigned char **outbufstart, size_t *irreversible)
|
|
{
|
|
/* Find out about the locale's transliteration. */
|
|
uint_fast32_t size;
|
|
const uint32_t *from_idx;
|
|
const uint32_t *from_tbl;
|
|
const uint32_t *to_idx;
|
|
const uint32_t *to_tbl;
|
|
const uint32_t *winbuf;
|
|
const uint32_t *winbufend;
|
|
uint_fast32_t low;
|
|
uint_fast32_t high;
|
|
|
|
/* The input buffer. There are actually 4-byte values. */
|
|
winbuf = (const uint32_t *) *inbufp;
|
|
winbufend = (const uint32_t *) inbufend;
|
|
|
|
__gconv_fct fct = step->__fct;
|
|
#ifdef PTR_DEMANGLE
|
|
if (step->__shlib_handle != NULL)
|
|
PTR_DEMANGLE (fct);
|
|
#endif
|
|
|
|
/* If there is no transliteration information in the locale don't do
|
|
anything and return the error. */
|
|
size = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_TRANSLIT_TAB_SIZE);
|
|
if (size == 0)
|
|
goto no_rules;
|
|
|
|
/* Get the rest of the values. */
|
|
from_idx =
|
|
(const uint32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TRANSLIT_FROM_IDX);
|
|
from_tbl =
|
|
(const uint32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TRANSLIT_FROM_TBL);
|
|
to_idx =
|
|
(const uint32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TRANSLIT_TO_IDX);
|
|
to_tbl =
|
|
(const uint32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TRANSLIT_TO_TBL);
|
|
|
|
/* Test whether there is enough input. */
|
|
if (winbuf + 1 > winbufend)
|
|
return (winbuf == winbufend
|
|
? __GCONV_EMPTY_INPUT : __GCONV_INCOMPLETE_INPUT);
|
|
|
|
/* The array starting at FROM_IDX contains indeces to the string table
|
|
in FROM_TBL. The indeces are sorted wrt to the strings. I.e., we
|
|
are doing binary search. */
|
|
low = 0;
|
|
high = size;
|
|
while (low < high)
|
|
{
|
|
uint_fast32_t med = (low + high) / 2;
|
|
uint32_t idx;
|
|
int cnt;
|
|
|
|
/* Compare the string at this index with the string at the current
|
|
position in the input buffer. */
|
|
idx = from_idx[med];
|
|
cnt = 0;
|
|
do
|
|
{
|
|
if (from_tbl[idx + cnt] != winbuf[cnt])
|
|
/* Does not match. */
|
|
break;
|
|
++cnt;
|
|
}
|
|
while (from_tbl[idx + cnt] != L'\0' && winbuf + cnt < winbufend);
|
|
|
|
if (cnt > 0 && from_tbl[idx + cnt] == L'\0')
|
|
{
|
|
/* Found a matching input sequence. Now try to convert the
|
|
possible replacements. */
|
|
uint32_t idx2 = to_idx[med];
|
|
|
|
do
|
|
{
|
|
/* Determine length of replacement. */
|
|
uint_fast32_t len = 0;
|
|
int res;
|
|
const unsigned char *toinptr;
|
|
unsigned char *outptr;
|
|
|
|
while (to_tbl[idx2 + len] != L'\0')
|
|
++len;
|
|
|
|
/* Try this input text. */
|
|
toinptr = (const unsigned char *) &to_tbl[idx2];
|
|
outptr = *outbufstart;
|
|
res = DL_CALL_FCT (fct,
|
|
(step, step_data, &toinptr,
|
|
(const unsigned char *) &to_tbl[idx2 + len],
|
|
&outptr, NULL, 0, 0));
|
|
if (res != __GCONV_ILLEGAL_INPUT)
|
|
{
|
|
/* If the conversion succeeds we have to increment the
|
|
input buffer. */
|
|
if (res == __GCONV_EMPTY_INPUT)
|
|
{
|
|
*inbufp += cnt * sizeof (uint32_t);
|
|
++*irreversible;
|
|
res = __GCONV_OK;
|
|
}
|
|
/* Do not increment the output pointer if we could not
|
|
store the entire output. */
|
|
if (res != __GCONV_FULL_OUTPUT)
|
|
*outbufstart = outptr;
|
|
|
|
return res;
|
|
}
|
|
|
|
/* Next replacement. */
|
|
idx2 += len + 1;
|
|
}
|
|
while (to_tbl[idx2] != L'\0');
|
|
|
|
/* Nothing found, continue searching. */
|
|
}
|
|
else if (cnt > 0)
|
|
/* This means that the input buffer contents matches a prefix of
|
|
an entry. Since we cannot match it unless we get more input,
|
|
we will tell the caller about it. */
|
|
return __GCONV_INCOMPLETE_INPUT;
|
|
|
|
if (winbuf + cnt >= winbufend || from_tbl[idx + cnt] < winbuf[cnt])
|
|
low = med + 1;
|
|
else
|
|
high = med;
|
|
}
|
|
|
|
no_rules:
|
|
/* Maybe the character is supposed to be ignored. */
|
|
if (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_TRANSLIT_IGNORE_LEN) != 0)
|
|
{
|
|
int n = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_TRANSLIT_IGNORE_LEN);
|
|
const uint32_t *ranges =
|
|
(const uint32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TRANSLIT_IGNORE);
|
|
const uint32_t wc = *(const uint32_t *) (*inbufp);
|
|
int i;
|
|
|
|
/* Test whether there is enough input. */
|
|
if (winbuf + 1 > winbufend)
|
|
return (winbuf == winbufend
|
|
? __GCONV_EMPTY_INPUT : __GCONV_INCOMPLETE_INPUT);
|
|
|
|
for (i = 0; i < n; ranges += 3, ++i)
|
|
if (ranges[0] <= wc && wc <= ranges[1]
|
|
&& (wc - ranges[0]) % ranges[2] == 0)
|
|
{
|
|
/* Matches the range. Ignore it. */
|
|
*inbufp += 4;
|
|
++*irreversible;
|
|
return __GCONV_OK;
|
|
}
|
|
else if (wc < ranges[0])
|
|
/* There cannot be any other matching range since they are
|
|
sorted. */
|
|
break;
|
|
}
|
|
|
|
/* One last chance: use the default replacement. */
|
|
if (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_TRANSLIT_DEFAULT_MISSING_LEN) != 0)
|
|
{
|
|
const uint32_t *default_missing = (const uint32_t *)
|
|
_NL_CURRENT (LC_CTYPE, _NL_CTYPE_TRANSLIT_DEFAULT_MISSING);
|
|
const unsigned char *toinptr = (const unsigned char *) default_missing;
|
|
uint32_t len = _NL_CURRENT_WORD (LC_CTYPE,
|
|
_NL_CTYPE_TRANSLIT_DEFAULT_MISSING_LEN);
|
|
unsigned char *outptr;
|
|
int res;
|
|
|
|
/* Test whether there is enough input. */
|
|
if (winbuf + 1 > winbufend)
|
|
return (winbuf == winbufend
|
|
? __GCONV_EMPTY_INPUT : __GCONV_INCOMPLETE_INPUT);
|
|
|
|
outptr = *outbufstart;
|
|
res = DL_CALL_FCT (fct,
|
|
(step, step_data, &toinptr,
|
|
(const unsigned char *) (default_missing + len),
|
|
&outptr, NULL, 0, 0));
|
|
|
|
if (res != __GCONV_ILLEGAL_INPUT)
|
|
{
|
|
/* If the conversion succeeds we have to increment the
|
|
input buffer. */
|
|
if (res == __GCONV_EMPTY_INPUT)
|
|
{
|
|
/* This worked but is not reversible. */
|
|
++*irreversible;
|
|
*inbufp += 4;
|
|
res = __GCONV_OK;
|
|
}
|
|
*outbufstart = outptr;
|
|
|
|
return res;
|
|
}
|
|
}
|
|
|
|
/* Haven't found a match. */
|
|
return __GCONV_ILLEGAL_INPUT;
|
|
}
|
|
libc_hidden_def (__gconv_transliterate)
|