mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-21 17:04:05 +00:00
ce85d65bae
1998-10-19 Ulrich Drepper <drepper@cygnus.com> * include/ldsodefs.h: New file. * iconv/gconv.c: Include ldsodefs.h, not elf/ldsodefs.h. Remove change to avoid using _CALL_DL_FCT. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/skeleton.c: Likewise, here for DL_CALL_FCT. * malloc/mtrace.c: Include ldsodefs.h, not elf/ldsodefs.h. * nss/nsswitch.c: Likewise. * nss/nsswitch.h: Likewise. 1998-10-19 Philip Blundell <pb@nexus.co.uk> * sunrpc/Makefile (otherlibs): If static NSS is in use, set to the required libraries. * login/Makefile (otherlibs): Likewise. * nscd/Makefile (otherlibs): Likewise. * Makeconfig (link-libc) [! build_shared]: Add $(otherlibs). * debug/Makefile (install-bin): Only build catchsegv if using ELF. * inet/Makefile: Add -DSTATIC_NSS to CFLAGS. 1998-10-19 Philip Blundell <pb@nexus.co.uk> * sysdeps/unix/sysv/linux/arm/syscalls.list: Added setfsgid and setfsuid. 1998-10-19 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nscd/connections.c: Fix typos in comments and strings. * nscd/nscd.conf: Update according to recent changes to nscd. * nscd/cache.c (prune_cache): Remove wrong comment. copy_posix.mask for copy instruction.
70 lines
2.1 KiB
C
70 lines
2.1 KiB
C
/* Convert characters in input buffer using conversion descriptor to
|
|
output buffer.
|
|
Copyright (C) 1997, 1998 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 <ldsodefs.h>
|
|
|
|
int
|
|
internal_function
|
|
__gconv (gconv_t cd, const char **inbuf, const char *inbufend, char **outbuf,
|
|
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 = _CALL_DL_FCT (cd->steps->fct,
|
|
(cd->steps, cd->data, NULL, NULL, converted, 1));
|
|
else
|
|
{
|
|
const 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 = _CALL_DL_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;
|
|
}
|