mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 10:22:41 +08:00
94e365c612
* sysdeps/gnu/Makefile (libdl-routines): Add eval. 1999-07-06 Zack Weinberg <zack@rabi.columbia.edu> * dlfcn: New directory. Move the following files from elf: dladdr.c, dlclose.c, dlerror.c, dlfcn.h, dlopen.c, dlopenold.c, dlsym.c, dlvsym.c. * dlfcn/Makefile: New file. * dlfcn/Versions: New file. * dlfcn/dlsym.c: All ELF-specific code split out to new function _dl_sym. * dlfcn/dlvsym.c: All ELF-specific code split out to new function _dl_vsym. * elf/dl-sym.c: New file. _dl_sym and _dl_vsym are implemented here. * dlfcn/dladdr.c: Remove all references to ELF data structures or headers. * dlfcn/dlclose.c: Likewise. * dlfcn/dlerror.c: Likewise. * dlfcn/dlopen.c: Likewise. * dlfcn/dlopenold.c: Likewise. * Makeconfig (dlfcn): New variable - set to `dlfcn' if elf is yes, empty otherwise. (libdl): Set to dlfcn/libdl.so or libdl.a if elf is yes, depending on build-shared. (subdirs): Add $(dlfcn). (rpath-dirs): Add dlfcn. * elf/Makefile: Remove all references to libdl or its components, except the ones relating to the test cases. (routines): Add dl-sym. * elf/Versions (libc): Add _dl_sym and _dl_vsym for GLIBC_2.2. (libdl): Delete. * elf/dl-close.c (_dl_close): Change argument to void *. * elf/dl-open.c (_dl_open): Change return type to void *. * elf/eval.c: Removed. * elf/ldsodefs.h: Move prototypes of _dl_catch_error, _dlerror_run, _dl_open, _dl_close, _dl_addr, and _dl_mcount_wrapper_check to include/dlfcn.h. Delete _CALL_DL_FCT macro. * include/dlfcn.h: Also prototype _dl_sym and _dl_vsym here. Include real header from dlfcn directory. * include/ldsodefs.h: Removed. * grp/initgroups.c: Use DL_CALL_FCT not _CALL_DL_FCT. * nss/getXXbyYY_r.c: Likewise. * nss/getXXent_r.c: Likewise. * iconv/gconv.c: Likewise. Don't include ldsodefs.h. * iconv/gconv_db.c: Likewise. Don't include ldsodefs.h. * iconv/skeleton.c: Don't include ldsodefs.h. * nss/nsswitch.h: Don't include ldsodefs.h. Include dlfcn.h. 1999-07-07 Ulrich Drepper <drepper@cygnus.com>
71 lines
2.2 KiB
C
71 lines
2.2 KiB
C
/* Convert characters in input buffer using conversion descriptor to
|
|
output buffer.
|
|
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 <assert.h>
|
|
#include <gconv.h>
|
|
#include <sys/param.h>
|
|
#include <dlfcn.h>
|
|
|
|
int
|
|
internal_function
|
|
__gconv (__gconv_t cd, const unsigned char **inbuf,
|
|
const unsigned char *inbufend, unsigned char **outbuf,
|
|
unsigned char *outbufend, size_t *converted)
|
|
{
|
|
size_t last_step = cd->__nsteps - 1;
|
|
int result;
|
|
|
|
if (cd == (__gconv_t) -1L)
|
|
return __GCONV_ILLEGAL_DESCRIPTOR;
|
|
|
|
assert (converted != NULL);
|
|
*converted = 0;
|
|
|
|
if (inbuf == NULL || *inbuf == NULL)
|
|
/* We just flush. */
|
|
result = DL_CALL_FCT (cd->__steps->__fct,
|
|
(cd->__steps, cd->__data, NULL, NULL,
|
|
converted, 1));
|
|
else
|
|
{
|
|
const unsigned char *last_start;
|
|
|
|
assert (outbuf != NULL && *outbuf != NULL);
|
|
cd->__data[last_step].__outbuf = *outbuf;
|
|
cd->__data[last_step].__outbufend = outbufend;
|
|
|
|
do
|
|
{
|
|
last_start = *inbuf;
|
|
result = DL_CALL_FCT (cd->__steps->__fct,
|
|
(cd->__steps, cd->__data, inbuf, inbufend,
|
|
converted, 0));
|
|
}
|
|
while (result == __GCONV_EMPTY_INPUT && last_start != *inbuf
|
|
&& *inbuf + cd->__steps->__min_needed_from <= inbufend);
|
|
}
|
|
|
|
if (outbuf != NULL && *outbuf != NULL)
|
|
*outbuf = cd->__data[last_step].__outbuf;
|
|
|
|
return result;
|
|
}
|