mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 11:20:07 +00:00
17c389fc2b
* libio/stdio.h: Make fseeko and ftello prototypes available is __USE_LARGEFILE. Patch by Paul Eggert <eggert@twinsun.com>. * sysdeps/generic/dl-environ.c (unsetenv): Follow change to the real unsetenv implementation from 1999-07-29 [PR libc/1714]. 2000-05-03 Bruno Haible <haible@clisp.cons.org> * intl/dcigettext.c (dcigettext): Do the defaulting of 'domainname' before calling tfind. 2000-03-05 Jakub Jelinek <jakub@redhat.com> * resolv/resolv.h (res_querydomain): Remove redefinition to __res_querydomain (reported by Owen Taylor <otaylor@redhat.com>). 2000-05-03 Ulrich Drepper <drepper@redhat.com> * po/gl.po: Update from translation team. * manual/intro.texi (Program Basics): Change section title. * manual/process.texi: Fix reference. (Executing a File): Add reference exec in other section. * manual/signal.texi: Fix reference. * manual/startup.texi: Document syscall function. Patches by Bryan Henderson <bryanh@giraffe-data.com>. 2000-04-29 Bruno Haible <haible@clisp.cons.org> * intl/libintl.h (bind_textdomain_codeset): New declaration. * intl/bindtextdom.c (set_binding_values): New function. (bindtextdomain): Call it. (bind_textdomain_codeset): New function. * intl/dcigettext.c (dcigettext): Pass binding to _nl_find_domain. (free_mem): Free each binding's codeset. * intl/gettextP.h (struct binding): Add codeset field. (_nl_find_domain): Add domainbinding argument. * intl/finddomain.c (_nl_find_domain): Add domainbinding argument. Pass it to _nl_make_l10nflist. * intl/loadinfo.h (struct loaded_l10nfile): Add domainbinding field. (_nl_make_l10nflist): Add domainbinding argument. * intl/l10nflist.c (_nl_make_l10nflist): Add domainbinding argument. * intl/loadmsgcat.c (_nl_load_domain): Look at the domainbinding's codeset when determining outcharset. If !_LIBC && HAVE_ICONV, call locale_charset(). * manual/message.texi: New node "Charset conversion in gettext". 2000-04-30 Bruno Haible <haible@clisp.cons.org> * catgets/open_catalog.c (__open_catalog): Use __builtin_expect where appropriate. Handle possible __read error. 2000-04-29 Bruno Haible <haible@clisp.cons.org> * intl/gettextP.h (__builtin_expect): Define as empty if not a compiler builtin. * intl/loadinfo.h (__builtin_expect): Likewise. * intl/dcigettext.c (dcigettext, _nl_find_msg): Use __builtin_expect where appropriate. * intl/loadmsgcat.c (_nl_load_domain): Likewise. * intl/localealias.c (extend_alias_table): Return an error indicator. (read_alias_file): Bail out if extend_alias_table fails. 2000-04-29 Bruno Haible <haible@clisp.cons.org> * intl/loadmsgcat.c: Define _GNU_SOURCE as early as possible. * intl/localealias.c: Likewise. 2000-05-01 Bruno Haible <haible@clisp.cons.org> * intl/loadmsgcat.c (_nl_load_domain): Initialize domain->conv_tab. Initialize domain->plural and domain->nplurals even if there is no nullentry. 2000-05-01 Bruno Haible <haible@clisp.cons.org> * intl/dcigettext.c (_nl_find_msg): Terminate __gconv loop if return value is == __GCONV_OK or == __GCONV_EMPTY_INPUT, not != __GCONV_OK. In case of failure, goto converted. 2000-05-01 Bruno Haible <haible@clisp.cons.org> * wcsmbs/wcsmbsload.c (norm_add_slashes): Move away. * iconv/gconv_int.h (norm_add_slashes): Move to here. * intl/loadmsgcat.c (_nl_load_domain): Normalize strings passed to __gconv_open. 2000-04-29 Bruno Haible <haible@clisp.cons.org> * intl/dcigettext.c (transcmp): Compare the domains as well. (dcigettext): Call strlen (msgid1) after testing msgid1 against NULL, not before. * intl/loadmsgcat.c (_nl_load_domain): Deal with EINTR. Include <errno.h>. 2000-05-03 Ulrich Drepper <drepper@redhat.com>
215 lines
6.7 KiB
C
215 lines
6.7 KiB
C
/* Copyright (C) 1997, 1998, 1999, 2000 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 Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#ifndef _GCONV_INT_H
|
|
#define _GCONV_INT_H 1
|
|
|
|
#include "gconv.h"
|
|
#include <regex.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
|
|
/* Structure for alias definition. Simply to strings. */
|
|
struct gconv_alias
|
|
{
|
|
const char *fromname;
|
|
const char *toname;
|
|
};
|
|
|
|
|
|
/* How many character should be conveted 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. */
|
|
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_pattern;
|
|
const char *from_constpfx;
|
|
size_t from_constpfx_len;
|
|
const regex_t *from_regex;
|
|
regex_t from_regex_mem;
|
|
|
|
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 *matching;/* Next node with more specific prefix. */
|
|
struct gconv_module *right; /* Prefix larger. */
|
|
};
|
|
|
|
|
|
/* Flags for `gconv_open'. */
|
|
enum
|
|
{
|
|
GCONV_AVOID_NOCONV = 1 << 0
|
|
};
|
|
|
|
|
|
/* Global variables. */
|
|
|
|
/* Database of alias names. */
|
|
extern void *__gconv_alias_db;
|
|
|
|
/* Array with available modules. */
|
|
extern size_t __gconv_nmodules;
|
|
extern struct gconv_module *__gconv_modules_db;
|
|
|
|
|
|
/* The gconv functions expects the name to be in upper case and complete,
|
|
including the trailing slashes if necessary. */
|
|
#define norm_add_slashes(str) \
|
|
({ \
|
|
const char *cp = (str); \
|
|
char *result; \
|
|
char *tmp; \
|
|
size_t cnt = 0; \
|
|
\
|
|
while (*cp != '\0') \
|
|
if (*cp++ == '/') \
|
|
++cnt; \
|
|
\
|
|
tmp = result = alloca (cp - (str) + 3); \
|
|
cp = (str); \
|
|
while (*cp != '\0') \
|
|
*tmp++ = _toupper (*cp++); \
|
|
if (cnt < 2) \
|
|
{ \
|
|
*tmp++ = '/'; \
|
|
if (cnt < 1) \
|
|
*tmp++ = '/'; \
|
|
} \
|
|
*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 *CONVERTED 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 *converted)
|
|
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;
|
|
|
|
/* Read all the configuration data and cache it. */
|
|
extern void __gconv_read_conf (void);
|
|
|
|
/* Comparison function to search alias. */
|
|
extern int __gconv_alias_compare (const void *__p1, const void *__p2);
|
|
|
|
/* 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;
|
|
|
|
/* 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 int __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;
|
|
|
|
|
|
|
|
/* Builtin transformations. */
|
|
#ifdef _LIBC
|
|
# define __BUILTIN_TRANS(Name) \
|
|
extern int Name (struct __gconv_step *__step, \
|
|
struct __gconv_step_data *__data, \
|
|
const unsigned char **__inbuf, \
|
|
const unsigned char *__inbufend, size_t *__written, \
|
|
int __do_flush, int __consume_incomplete)
|
|
|
|
__BUILTIN_TRANS (__gconv_transform_ascii_internal);
|
|
__BUILTIN_TRANS (__gconv_transform_internal_ascii);
|
|
__BUILTIN_TRANS (__gconv_transform_utf8_internal);
|
|
__BUILTIN_TRANS (__gconv_transform_internal_utf8);
|
|
__BUILTIN_TRANS (__gconv_transform_ucs2_internal);
|
|
__BUILTIN_TRANS (__gconv_transform_internal_ucs2);
|
|
__BUILTIN_TRANS (__gconv_transform_ucs2reverse_internal);
|
|
__BUILTIN_TRANS (__gconv_transform_internal_ucs2reverse);
|
|
__BUILTIN_TRANS (__gconv_transform_internal_ucs4);
|
|
__BUILTIN_TRANS (__gconv_transform_ucs4_internal);
|
|
__BUILTIN_TRANS (__gconv_transform_internal_ucs4le);
|
|
__BUILTIN_TRANS (__gconv_transform_ucs4le_internal);
|
|
__BUILTIN_TRANS (__gconv_transform_internal_utf16);
|
|
__BUILTIN_TRANS (__gconv_transform_utf16_internal);
|
|
# undef __BUITLIN_TRANS
|
|
|
|
#endif
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* gconv_int.h */
|