mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 14:30:06 +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.
288 lines
9.3 KiB
C
288 lines
9.3 KiB
C
/* Copyright (C) 1997-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
|
|
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/>. */
|
|
|
|
#ifndef _GCONV_INT_H
|
|
#define _GCONV_INT_H 1
|
|
|
|
#include "gconv.h"
|
|
#include <stdlib.h> /* For alloca used in macro below. */
|
|
#include <ctype.h> /* For __toupper_l used in macro below. */
|
|
#include <string.h> /* For strlen et al used in macro below. */
|
|
#include <libc-lock.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
|
|
/* Type to represent search path. */
|
|
struct path_elem
|
|
{
|
|
const char *name;
|
|
size_t len;
|
|
};
|
|
|
|
/* Variable with search path for `gconv' implementation. */
|
|
extern struct path_elem *__gconv_path_elem attribute_hidden;
|
|
/* Maximum length of a single path element. */
|
|
extern size_t __gconv_max_path_elem_len attribute_hidden;
|
|
|
|
|
|
/* Structure for alias definition. Simply two strings. */
|
|
struct gconv_alias
|
|
{
|
|
char *fromname;
|
|
char *toname;
|
|
};
|
|
|
|
|
|
/* How many character should be converted in one call? */
|
|
#define GCONV_NCHAR_GOAL 8160
|
|
|
|
|
|
/* Structure describing one loaded shared object. This normally are
|
|
objects to perform conversation but as a special case the db shared
|
|
object is also handled. */
|
|
struct __gconv_loaded_object
|
|
{
|
|
/* Name of the object. It must be the first structure element. */
|
|
const char *name;
|
|
|
|
/* Reference counter for the db functionality. If no conversion is
|
|
needed we unload the db library. */
|
|
int counter;
|
|
|
|
/* The handle for the shared object. */
|
|
void *handle;
|
|
|
|
/* Pointer to the functions the module defines. */
|
|
__gconv_fct fct;
|
|
__gconv_init_fct init_fct;
|
|
__gconv_end_fct end_fct;
|
|
};
|
|
|
|
|
|
/* Description for an available conversion module. */
|
|
struct gconv_module
|
|
{
|
|
const char *from_string;
|
|
const char *to_string;
|
|
|
|
int cost_hi;
|
|
int cost_lo;
|
|
|
|
const char *module_name;
|
|
|
|
struct gconv_module *left; /* Prefix smaller. */
|
|
struct gconv_module *same; /* List of entries with identical prefix. */
|
|
struct gconv_module *right; /* Prefix larger. */
|
|
};
|
|
|
|
|
|
/* Flags for `gconv_open'. */
|
|
enum
|
|
{
|
|
GCONV_AVOID_NOCONV = 1 << 0
|
|
};
|
|
|
|
/* When GCONV_AVOID_NOCONV is set and no conversion is needed,
|
|
__GCONV_NULCONV should be returned. */
|
|
enum
|
|
{
|
|
__GCONV_NULCONV = -1
|
|
};
|
|
|
|
/* Global variables. */
|
|
|
|
/* Database of alias names. */
|
|
extern void *__gconv_alias_db attribute_hidden;
|
|
|
|
/* Array with available modules. */
|
|
extern size_t __gconv_nmodules;
|
|
extern struct gconv_module *__gconv_modules_db attribute_hidden;
|
|
|
|
/* Value of the GCONV_PATH environment variable. */
|
|
extern const char *__gconv_path_envvar attribute_hidden;
|
|
|
|
/* Lock for the conversion database content. */
|
|
__libc_lock_define (extern, __gconv_lock attribute_hidden)
|
|
|
|
|
|
/* The gconv functions expects the name to be in upper case and complete,
|
|
including the trailing slashes if necessary. */
|
|
#define norm_add_slashes(str,suffix) \
|
|
({ \
|
|
const char *cp = (str); \
|
|
char *result; \
|
|
char *tmp; \
|
|
size_t cnt = 0; \
|
|
const size_t suffix_len = strlen (suffix); \
|
|
\
|
|
while (*cp != '\0') \
|
|
if (*cp++ == '/') \
|
|
++cnt; \
|
|
\
|
|
tmp = result = __alloca (cp - (str) + 3 + suffix_len); \
|
|
cp = (str); \
|
|
while (*cp != '\0') \
|
|
*tmp++ = __toupper_l (*cp++, _nl_C_locobj_ptr); \
|
|
if (cnt < 2) \
|
|
{ \
|
|
*tmp++ = '/'; \
|
|
if (cnt < 1) \
|
|
{ \
|
|
*tmp++ = '/'; \
|
|
if (suffix_len != 0) \
|
|
tmp = __mempcpy (tmp, suffix, suffix_len); \
|
|
} \
|
|
} \
|
|
*tmp = '\0'; \
|
|
result; \
|
|
})
|
|
|
|
|
|
/* Return in *HANDLE decriptor for transformation from FROMSET to TOSET. */
|
|
extern int __gconv_open (const char *toset, const char *fromset,
|
|
__gconv_t *handle, int flags)
|
|
internal_function;
|
|
|
|
/* Free resources associated with transformation descriptor CD. */
|
|
extern int __gconv_close (__gconv_t cd)
|
|
internal_function;
|
|
|
|
/* Transform at most *INBYTESLEFT bytes from buffer starting at *INBUF
|
|
according to rules described by CD and place up to *OUTBYTESLEFT
|
|
bytes in buffer starting at *OUTBUF. Return number of non-identical
|
|
conversions in *IRREVERSIBLE if this pointer is not null. */
|
|
extern int __gconv (__gconv_t cd, const unsigned char **inbuf,
|
|
const unsigned char *inbufend, unsigned char **outbuf,
|
|
unsigned char *outbufend, size_t *irreversible)
|
|
internal_function;
|
|
|
|
/* Return in *HANDLE a pointer to an array with *NSTEPS elements describing
|
|
the single steps necessary for transformation from FROMSET to TOSET. */
|
|
extern int __gconv_find_transform (const char *toset, const char *fromset,
|
|
struct __gconv_step **handle,
|
|
size_t *nsteps, int flags)
|
|
internal_function;
|
|
|
|
/* Search for transformation in cache data. */
|
|
extern int __gconv_lookup_cache (const char *toset, const char *fromset,
|
|
struct __gconv_step **handle, size_t *nsteps,
|
|
int flags)
|
|
internal_function;
|
|
|
|
/* Compare the two name for whether they are after alias expansion the
|
|
same. This function uses the cache and fails if none is
|
|
loaded. */
|
|
extern int __gconv_compare_alias_cache (const char *name1, const char *name2,
|
|
int *result) internal_function;
|
|
|
|
/* Free data associated with a step's structure. */
|
|
extern void __gconv_release_step (struct __gconv_step *step)
|
|
internal_function;
|
|
|
|
/* Read all the configuration data and cache it. */
|
|
extern void __gconv_read_conf (void) attribute_hidden;
|
|
|
|
/* Try to read module cache file. */
|
|
extern int __gconv_load_cache (void) internal_function;
|
|
|
|
/* Retrieve pointer to internal cache. */
|
|
extern void *__gconv_get_cache (void);
|
|
|
|
/* Retrieve pointer to internal module database. */
|
|
extern struct gconv_module *__gconv_get_modules_db (void);
|
|
|
|
/* Retrieve pointer to internal alias database. */
|
|
extern void *__gconv_get_alias_db (void);
|
|
|
|
/* Determine the directories we are looking in. */
|
|
extern void __gconv_get_path (void) internal_function;
|
|
|
|
/* Comparison function to search alias. */
|
|
extern int __gconv_alias_compare (const void *p1, const void *p2)
|
|
attribute_hidden;
|
|
|
|
/* Clear reference to transformation step implementations which might
|
|
cause the code to be unloaded. */
|
|
extern int __gconv_close_transform (struct __gconv_step *steps,
|
|
size_t nsteps)
|
|
internal_function;
|
|
|
|
/* Free all resources allocated for the transformation record when
|
|
using the cache. */
|
|
extern void __gconv_release_cache (struct __gconv_step *steps, size_t nsteps)
|
|
internal_function;
|
|
|
|
/* Load shared object named by NAME. If already loaded increment reference
|
|
count. */
|
|
extern struct __gconv_loaded_object *__gconv_find_shlib (const char *name)
|
|
internal_function;
|
|
|
|
/* Release shared object. If no further reference is available unload
|
|
the object. */
|
|
extern void __gconv_release_shlib (struct __gconv_loaded_object *handle)
|
|
internal_function;
|
|
|
|
/* Fill STEP with information about builtin module with NAME. */
|
|
extern void __gconv_get_builtin_trans (const char *name,
|
|
struct __gconv_step *step)
|
|
internal_function;
|
|
|
|
libc_hidden_proto (__gconv_transliterate)
|
|
|
|
/* If NAME is an codeset alias expand it. */
|
|
extern int __gconv_compare_alias (const char *name1, const char *name2)
|
|
internal_function;
|
|
|
|
|
|
/* Builtin transformations. */
|
|
#ifdef _LIBC
|
|
# define __BUILTIN_TRANSFORM(Name) \
|
|
extern int Name (struct __gconv_step *step, \
|
|
struct __gconv_step_data *data, \
|
|
const unsigned char **inbuf, \
|
|
const unsigned char *inbufend, \
|
|
unsigned char **outbufstart, size_t *irreversible, \
|
|
int do_flush, int consume_incomplete)
|
|
|
|
__BUILTIN_TRANSFORM (__gconv_transform_ascii_internal);
|
|
__BUILTIN_TRANSFORM (__gconv_transform_internal_ascii);
|
|
__BUILTIN_TRANSFORM (__gconv_transform_utf8_internal);
|
|
__BUILTIN_TRANSFORM (__gconv_transform_internal_utf8);
|
|
__BUILTIN_TRANSFORM (__gconv_transform_ucs2_internal);
|
|
__BUILTIN_TRANSFORM (__gconv_transform_internal_ucs2);
|
|
__BUILTIN_TRANSFORM (__gconv_transform_ucs2reverse_internal);
|
|
__BUILTIN_TRANSFORM (__gconv_transform_internal_ucs2reverse);
|
|
__BUILTIN_TRANSFORM (__gconv_transform_internal_ucs4);
|
|
__BUILTIN_TRANSFORM (__gconv_transform_ucs4_internal);
|
|
__BUILTIN_TRANSFORM (__gconv_transform_internal_ucs4le);
|
|
__BUILTIN_TRANSFORM (__gconv_transform_ucs4le_internal);
|
|
__BUILTIN_TRANSFORM (__gconv_transform_internal_utf16);
|
|
__BUILTIN_TRANSFORM (__gconv_transform_utf16_internal);
|
|
# undef __BUITLIN_TRANSFORM
|
|
|
|
/* Specialized conversion function for a single byte to INTERNAL, recognizing
|
|
only ASCII characters. */
|
|
extern wint_t __gconv_btwoc_ascii (struct __gconv_step *step, unsigned char c);
|
|
|
|
#endif
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* gconv_int.h */
|