mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 15:20:10 +00:00
d64b6ad075
* Versions.def: Add GLIBC_2.2 for libc. * iconv/gconv.h: Make header suitable for inclusion in public header by protecting all names with __. * iconv/gconv.c: Adapt for symbol name changes. * iconv/gconv.h: Likewise. * iconv/gconv_builtin.c: Likewise. * iconv/gconv_close.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_open.c: Likewise. * iconv/gconv_simple.c: Likewise. * iconv/iconv.c: Likewise. * iconv/iconv_close.c: Likewise. * iconv/iconv_open.c: Likewise. * iconv/loop.c: Likewise. * iconv/skeleton.c: Likewise. * iconvdata/8bit-gap.c: Likewise. * iconvdata/8bit-generic.c: Likewise. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/cns11643.h: Likewise. * iconvdata/cns11643l1.h: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/euc-tw.c: Likewise. * iconvdata/gb2312.h: Likewise. * iconvdata/iso-2022-jp.c: Likewise. * iconvdata/iso-2022-kr.c: Likewise. * iconvdata/iso646.c: Likewise. * iconvdata/iso8859-1.c: Likewise. * iconvdata/iso_6937-2.c: Likewise. * iconvdata/iso_6937.c: Likewise. * iconvdata/jis0201.h: Likewise. * iconvdata/jis0208.h: Likewise. * iconvdata/jis0212.h: Likewise. * iconvdata/johab.c: Likewise. * iconvdata/ksc5601.h: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t.61.c: Likewise. * iconvdata/uhc.c: Likewise. * stdlib/mblen.c: Likewise. * stdlib/mbtowc.c: Likewise. * stdlib/wctomb.c: Likewise. * wcsmbs/btowc.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wchar.h: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * wcsmbs/wcsmbsload.h: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. * include/limits.h (MB_LEN_MAX): Increase to 16. * sysdeps/generic/_G_config.h: Define _G_fpos_t as struct. Define _G_iconv_t. * sysdeps/unix/sysv/linux/_G_config.h: Likewise. * include/wchar.h: Change mbstate_t to __mbstate_t. * libio/Makefile (routines): Add wfiledoalloc, oldiofgetpos, oldiofgetpos64, oldiofsetpos, oldiofsetpos64, fputwc, fputwc_u, getwc, getwc_u, getwchar, getwchar_u, iofgetws, iofgetws_u, iofputws, iofputws_u, iogetwline, iowpadn, ioungetwc, putwc, putwc_u, putchar, putchar_u, swprintf, vwprintf, wprintf, wscanf, fwscanf, vwscanf, vswprintf, iovswscanf, swscanf, wgenops, wstrops, wfileops, and iofwide. (tests): Add tst_swprintf, tst_wprintf, tst_swscanf, and tst_wscanf. * libio/Versions: Add _IO_fgetpos, _IO_fgetpos64, _IO_fsetpos, _IO_fsetpos64, fgetpos, fgetpos64, fgetwc, fgetwc_unlocked, fgetws, fgetws_unlocked, fputwc, fputwc_unlocked, fputws, fputws_unlocked, fsetpos, fsetpos64, fwide, fwprintf, fwscanf, getwc, getwc_unlocked, getwchar, getwchar_unlocked, putwc, putwc_unlocked, putwchar, putwchar_unlocked, swprintf, swscanf, ungetwc, vfwprintf, vswprintf, vwprintf, vfwscanf, vswscanf, vwscanf, wprintf, and wscanf to GLIBC_2.2 for libc. * libio/libio.h: Define codecvt struct. Define _IO_wide_data. Extend _IO_file contain pointer to codecvt, widedata and mode. (_IO_getwc_unlocked): New macro. (_IO_putwc_unlocked): New macro. (_IO_fwide): New macro. * libio/libioP.h: Add new prototypes and adjust existing declarations. * libio/fileops.c (_IO_new_file_close_it): Reset normal or widedata buffers based on mode. (new_do_write): Set _IO_write_end to _IO_buf_end if stream is wide oriented. (_IO_new_file_overflow): Don't depend only on _IO_CURRENTLY_PUTTING flag to be enough to signal unallocated buffer. For wide oriented stream don't make it linebuffered. Don't use _IO_do_flush, use _IO_new_do_write directly. (_IO_new_file_seekoff): Change return value type to _IO_off64_t. (_IO_file_seek): Likewise. * libio/genops.c (_IO_least_marker): Make global. (__underflow): Orient stream if not already done. (__uflow): Likewise. (_IO_default_seekpos): Change to type _IO_off64_t. (_IO_default_seekoff): Likewise. (_IO_default_seek): Likewise. (_IO_no_init): New function. Similar to _IO_init but allows to orient in initialization. * libio/iolibio.h: Add prototype for _IO_vswprintf. Change _IO_pos_BAD to use _IO_off64_t. * libio/ftello.c: Use _IO_off_t. For now abort when use with wide char stream. * libio/ftello64.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofopncook.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/oldfileops.c: Likewise. * libio/iofgetpos.c: Store state of conversion if necessary. * libio/iofgetpos64.c: Likewise. * libio/iofsetpos.c: Restore conversion state if necessary. * libio/iofsetpos64.c: Likewise. * libio/iofdopen.c: Initialize so that stream can be wide oriented. * libio/iofopen.c: Likewise. * libio/iofopen64.c: Likewise. * libio/iopopen.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/memstream.c: Likewise. * libio/obprintf.c: Likewise. * libio/iofputs.c: Orient stream if not already happened. * libio/iofputs_u.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iofwrite_u.c: Likewise. * libio/ioputs.c: Likewise. * libio/iosetbuffer.c: Handle not yet oriented stream. * libio/iosetvbuf.c: Likewise. * libio/oldstdfiles.c: Adjust FILEBUF_LITERAL call. * libio/stdfiles.c: Likewise. * libio/strops.c (_IO_str_overflow): Correctly free buffer after failed allocation. (_IO_str_seekoff): Use _IO_off64_t. * libio/vasprintf.c: Pre-orient stream. * libio/vsnprintf.c: Likewise. * libio/fputwc.c: New file. * libio/fputwc_u.c: New file. * libio/fwprintf.c: New file. * libio/fwscanf.c: New file. * libio/getwc.c: New file. * libio/getwc_u.c: New file. * libio/getwchar.c: New file. * libio/getwchar_u.c: New file. * libio/iofgetws.c: New file. * libio/iofgetws_u.c: New file. * libio/iofputws.c: New file. * libio/iofputws_u.c: New file. * libio/iofwide.c: New file. * libio/iogetwline.c: New file. * libio/ioungetwc.c: New file. * libio/iovswscanf.c: New file. * libio/iowpadn.c: New file. * libio/oldiofgetpos.c: New file. * libio/oldiofgetpos64.c: New file. * libio/oldiofsetpos.c: New file. * libio/oldiofsetpos64.c: New file. * libio/putwc.c: New file. * libio/putwc_u.c: New file. * libio/putwchar.c: New file. * libio/putwchar_u.c: New file. * libio/swprintf.c: New file. * libio/swscanf.c: New file. * libio/tst_swprintf.c: New file. * libio/tst_swscanf.c: New file. * libio/tst_wprintf.c: New file. * libio/tst_wscanf.c: New file. * libio/tst_wscanf.input: New file. * libio/vswprintf.c: New file. * libio/vwprintf.c: New file. * libio/vwscanf.c: New file. * libio/wfiledoalloc.c: New file. * libio/wfileops.c: New file. * libio/wgenops.c: New file. * libio/wprintf.c: New file. * libio/wscanf.c: New file. * libio/wstrops.c: New file. * stdio-common/Makefile (routines): Add _itowa, itowa-digits, vfwprintf, and vfwscanf. * stdio-common/_itoa.c (base_table): Rename to _IO_base_table and make global. * stdio-common/_itowa.c: New file. * stdio-common/_itowa.h: New file. * stdio-common/itoa-digits.c: Minimal optimization. * stdio-common/itowa-digits.c: New file. * stdio-common/printf-parse.h: Allow use in wide character context. * stdio-common/printf-prs.c: Define ISASCII and MBRLEN. * stdio-common/printf.h (printf_info): Add wide bit. * stdio-common/printf_fp.c: Determine from wide bit whether stream is wide oriented or not. * stdio-common/printf_size.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * stdlib/strfmon.c: Call __printf_fp with wide bit cleared. * stdio-common/vfprintf.c: Rewrite to allow use in wide character context. * stdio-common/vfscand.c: Likewise. * stdio-common/vfwprintf.c: New file. * stdio-common/vfwscanf.c: New file. * time/Makefile (routines): Add wcsftime. (tests): Add tst_wcsftime. * time/Versions: Add wcsftime to GLIBC_2.2 for libc. * time/strftime.c: Make usable as wcsftime. * time/wcsftime.c: New file. * time/tst_wcsftime.c: New file. * wcsmbs/Makefile (routines): Add wmempcpy and wcschrnul. * wcsmbs/Versions: Add wmempcpy and wcschrnul to GLIBC_2.2 for libc. * wcsmbs/wcschrnul.c: New file. * wcsmbs/wmemcpy.c: New file. * wcsmbs/wmemcpy.c: Rename to __wmemcpy and make wmemcpy weak alias. * wcsmbs/wmemmove.c: Likewise for wmemmove. * manual/stdio.texi: Document is_char and wide element if printf_info. * manual/time.texi: Document wcsftime. * include/wchar.h: Add prototypes for __wmemcpy, __wmempcpy, __wmemmove, __wcschrnul, and __vfwscanf. * locale/langinfo.h: Add new LC_TIME entries for wchar_t data. * locale/C-time.c: Adapt for above change. * locale/categories.def: Likewise. * locale/localeinfo.h: Likewise. * localedata/Makefile: Don't run tests for now.
276 lines
7.5 KiB
C
276 lines
7.5 KiB
C
/* Handle loading/unloading of shared object for transformation.
|
|
Copyright (C) 1997, 1998, 1999 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. */
|
|
|
|
#include <dlfcn.h>
|
|
#include <inttypes.h>
|
|
#include <search.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <bits/libc-lock.h>
|
|
#include <sys/param.h>
|
|
|
|
#include <ldsodefs.h>
|
|
#include <gconv_int.h>
|
|
|
|
|
|
/* This is a tuning parameter. If a transformation module is not used
|
|
anymore it gets not immediately unloaded. Instead we wait a certain
|
|
number of load attempts for further modules. If none of the
|
|
subsequent load attempts name the same object it finally gets unloaded.
|
|
Otherwise it is still available which hopefully is the frequent case.
|
|
The following number is the number of unloading attempts we wait
|
|
before unloading. */
|
|
#define TRIES_BEFORE_UNLOAD 2
|
|
|
|
|
|
/* Array of loaded objects. This is shared by all threads so we have
|
|
to use semaphores to access it. */
|
|
static void *loaded;
|
|
|
|
|
|
|
|
/* Comparison function for searching `loaded_object' tree. */
|
|
static int
|
|
known_compare (const void *p1, const void *p2)
|
|
{
|
|
const struct __gconv_loaded_object *s1 =
|
|
(const struct __gconv_loaded_object *) p1;
|
|
const struct __gconv_loaded_object *s2 =
|
|
(const struct __gconv_loaded_object *) p2;
|
|
|
|
return (intptr_t) s1->handle - (intptr_t) s2->handle;
|
|
}
|
|
|
|
|
|
static void
|
|
do_open (void *a)
|
|
{
|
|
struct __gconv_loaded_object *args = (struct __gconv_loaded_object *) a;
|
|
/* Open and relocate the shared object. */
|
|
args->handle = _dl_open (args->name, RTLD_LAZY, NULL);
|
|
}
|
|
|
|
|
|
static int
|
|
internal_function
|
|
dlerror_run (void (*operate) (void *), void *args)
|
|
{
|
|
char *last_errstring = NULL;
|
|
int result;
|
|
|
|
(void) _dl_catch_error (&last_errstring, operate, args);
|
|
|
|
result = last_errstring != NULL;
|
|
if (result)
|
|
free (last_errstring);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
struct get_sym_args
|
|
{
|
|
/* Arguments to get_sym. */
|
|
struct link_map *map;
|
|
const char *name;
|
|
|
|
/* Return values of get_sym. */
|
|
ElfW(Addr) loadbase;
|
|
const ElfW(Sym) *ref;
|
|
};
|
|
|
|
static void
|
|
get_sym (void *a)
|
|
{
|
|
struct get_sym_args *args = (struct get_sym_args *) a;
|
|
args->ref = NULL;
|
|
args->loadbase = _dl_lookup_symbol (args->name, &args->ref,
|
|
args->map->l_local_scope,
|
|
args->map->l_name, 0);
|
|
}
|
|
|
|
|
|
void *
|
|
internal_function
|
|
__gconv_find_func (void *handle, const char *name)
|
|
{
|
|
struct get_sym_args args;
|
|
|
|
args.map = handle;
|
|
args.name = name;
|
|
|
|
return (dlerror_run (get_sym, &args) ? NULL
|
|
: (void *) (args.loadbase + args.ref->st_value));
|
|
}
|
|
|
|
|
|
|
|
/* Open the gconv database if necessary. A non-negative return value
|
|
means success. */
|
|
struct __gconv_loaded_object *
|
|
internal_function
|
|
__gconv_find_shlib (const char *name)
|
|
{
|
|
struct __gconv_loaded_object *found;
|
|
void *keyp;
|
|
|
|
/* Search the tree of shared objects previously requested. Data in
|
|
the tree are `loaded_object' structures, whose first member is a
|
|
`const char *', the lookup key. The search returns a pointer to
|
|
the tree node structure; the first member of the is a pointer to
|
|
our structure (i.e. what will be a `loaded_object'); since the
|
|
first member of that is the lookup key string, &FCT_NAME is close
|
|
enough to a pointer to our structure to use as a lookup key that
|
|
will be passed to `known_compare' (above). */
|
|
|
|
keyp = __tfind (&name, &loaded, known_compare);
|
|
if (keyp == NULL)
|
|
{
|
|
/* This name was not known before. */
|
|
found = malloc (sizeof (struct __gconv_loaded_object));
|
|
if (found != NULL)
|
|
{
|
|
/* Point the tree node at this new structure. */
|
|
found->name = name;
|
|
found->counter = -TRIES_BEFORE_UNLOAD - 1;
|
|
found->handle = NULL;
|
|
|
|
if (__tsearch (found, &loaded, known_compare) == NULL)
|
|
{
|
|
/* Something went wrong while inserting the entry. */
|
|
free (found);
|
|
found = NULL;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
found = *(struct __gconv_loaded_object **) keyp;
|
|
|
|
/* Try to load the shared object if the usage count is 0. This
|
|
implies that if the shared object is not loadable, the handle is
|
|
NULL and the usage count > 0. */
|
|
if (found != NULL)
|
|
{
|
|
if (found->counter < -TRIES_BEFORE_UNLOAD)
|
|
{
|
|
if (dlerror_run (do_open, found) == 0)
|
|
{
|
|
found->fct = __gconv_find_func (found->handle, "gconv");
|
|
if (found->fct == NULL)
|
|
{
|
|
/* Argh, no conversion function. There is something
|
|
wrong here. */
|
|
__gconv_release_shlib (found);
|
|
found = NULL;
|
|
}
|
|
else
|
|
{
|
|
found->init_fct = __gconv_find_func (found->handle,
|
|
"gconv_init");
|
|
found->end_fct = __gconv_find_func (found->handle,
|
|
"gconv_end");
|
|
|
|
/* We have succeeded in loading the shared object. */
|
|
found->counter = 1;
|
|
}
|
|
}
|
|
else
|
|
/* Error while loading the shared object. */
|
|
found = NULL;
|
|
}
|
|
else if (found->handle != NULL)
|
|
found->counter = MAX (found->counter + 1, 1);
|
|
}
|
|
|
|
return found;
|
|
}
|
|
|
|
|
|
/* This is very ugly but the tsearch functions provide no way to pass
|
|
information to the walker function. So we use a global variable.
|
|
It is MT safe since we use a lock. */
|
|
static struct __gconv_loaded_object *release_handle;
|
|
|
|
static void
|
|
do_release_shlib (const void *nodep, VISIT value, int level)
|
|
{
|
|
struct __gconv_loaded_object *obj = *(struct __gconv_loaded_object **) nodep;
|
|
|
|
if (value != preorder && value != leaf)
|
|
return;
|
|
|
|
if (obj == release_handle)
|
|
/* This is the object we want to unload. Now set the release
|
|
counter to zero. */
|
|
obj->counter = 0;
|
|
else if (obj->counter <= 0)
|
|
{
|
|
if (--obj->counter < -TRIES_BEFORE_UNLOAD && obj->handle != NULL)
|
|
{
|
|
/* Unload the shared object. We don't use the trick to
|
|
catch errors since in the case an error is signalled
|
|
something is really wrong. */
|
|
_dl_close (obj->handle);
|
|
|
|
obj->handle = NULL;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/* Notify system that a shared object is not longer needed. */
|
|
int
|
|
internal_function
|
|
__gconv_release_shlib (struct __gconv_loaded_object *handle)
|
|
{
|
|
/* Urgh, this is ugly but we have no other possibility. */
|
|
release_handle = handle;
|
|
|
|
/* Process all entries. Please note that we also visit entries
|
|
with release counts <= 0. This way we can finally unload them
|
|
if necessary. */
|
|
__twalk (loaded, do_release_shlib);
|
|
|
|
return __GCONV_OK;
|
|
}
|
|
|
|
|
|
/* We run this if we debug the memory allocation. */
|
|
static void
|
|
do_release_all (void *nodep)
|
|
{
|
|
struct __gconv_loaded_object *obj = (struct __gconv_loaded_object *) nodep;
|
|
|
|
/* Unload the shared object. We don't use the trick to
|
|
catch errors since in the case an error is signalled
|
|
something is really wrong. */
|
|
if (obj->handle != NULL)
|
|
_dl_close (obj->handle);
|
|
|
|
free (obj);
|
|
}
|
|
|
|
static void __attribute__ ((unused))
|
|
free_mem (void)
|
|
{
|
|
__tdestroy (loaded, do_release_all);
|
|
}
|
|
text_set_element (__libc_subfreeres, free_mem);
|