mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 00:19:57 +00:00
f1d5c60dde
2000-06-15 Ulrich Drepper <drepper@redhat.com> * iconv/gconv.h (__gconv_fct): Change type of fifth parameter to unsigned char **. (__gconv_init_fct): Remove two parameters. * iconv/gconv_int.h (__gconv_transliterate): Renamed from gconv_transliterate. Remove two parameters. Change prototypes of builtin functions according to __gconv_fct change. * iconv/skeleton.c: Change type of fifth parameter. make sure it is != NULL only during error handling. Stop in this case after the conversion. * iconv/gconv_trans.c: Replace with real implementation for __gconv_transliterate. * iconv/gconv_open.c: Adjust for renaming of __gconv_transliterate. * iconv/gconv.c: Change calls to downstream functions once again. Use NULL for the fifth parameter instead of pointer to output buffer. * libio/iofwide.c: Likewise. * wcsmbs/btowc.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. * iconv/gconv_simple.c: Remove two parameters from error handling function call. * iconvdata/8bit-gap.c: Likewise. * iconvdata/8bit-generic.c: Likewise. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/big5hkscs.c: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/euc-tw.c: Likewise. * iconvdata/gbgbk.c: Likewise. * iconvdata/gbk.c: Likewise. * iconvdata/iso-2022-cn.c: 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/johab.c: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t.61.c: Likewise. * iconvdata/uhc.c: Likewise. * iconvdata/unicode.c: Likewise. * iconvdata/utf-16.c: Likewise.
73 lines
2.3 KiB
C
73 lines
2.3 KiB
C
/* Convert characters in input buffer using conversion descriptor to
|
|
output buffer.
|
|
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. */
|
|
|
|
#include <assert.h>
|
|
#include <gconv.h>
|
|
#include <sys/param.h>
|
|
#include <dlfcn.h>
|
|
#include <stddef.h>
|
|
|
|
int
|
|
internal_function
|
|
__gconv (__gconv_t cd, const unsigned char **inbuf,
|
|
const unsigned char *inbufend, unsigned char **outbuf,
|
|
unsigned char *outbufend, size_t *irreversible)
|
|
{
|
|
size_t last_step = cd->__nsteps - 1;
|
|
int result;
|
|
|
|
if (cd == (__gconv_t) -1L)
|
|
return __GCONV_ILLEGAL_DESCRIPTOR;
|
|
|
|
assert (irreversible != NULL);
|
|
*irreversible = 0;
|
|
|
|
cd->__data[last_step].__outbuf = outbuf != NULL ? *outbuf : NULL;
|
|
cd->__data[last_step].__outbufend = outbufend;
|
|
|
|
if (inbuf == NULL || *inbuf == NULL)
|
|
/* We just flush. */
|
|
result = DL_CALL_FCT (cd->__steps->__fct,
|
|
(cd->__steps, cd->__data, NULL, NULL, NULL,
|
|
irreversible, 1, 0));
|
|
else
|
|
{
|
|
const unsigned char *last_start;
|
|
|
|
assert (outbuf != NULL && *outbuf != NULL);
|
|
|
|
do
|
|
{
|
|
last_start = *inbuf;
|
|
result = DL_CALL_FCT (cd->__steps->__fct,
|
|
(cd->__steps, cd->__data, inbuf, inbufend,
|
|
NULL, irreversible, 0, 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;
|
|
}
|