2373b30ea8
2001-05-20 Bruno Haible <haible@clisp.cons.org> * iconvdata/cp1255.c: Completely rewritten. * iconvdata/Makefile (gen-8bit-gap-modules): Remove cp1255. * iconvdata/testdata/WINDOWS-1255: New file. * iconvdata/testdata/WINDOWS-1255..UTF8: New file. * iconvdata/TESTS: Add WINDOWS-1255 test. * iconvdata/CP1255.irreversible: New file. 2001-05-20 Bruno Haible <haible@clisp.cons.org> * iconvdata/cp1258.c: Completely rewritten. * iconvdata/Makefile (gen-8bit-gap-modules): Remove cp1258. * iconvdata/testdata/WINDOWS-1258: New file. * iconvdata/testdata/WINDOWS-1258..UTF8: New file. * iconvdata/TESTS: Add WINDOWS-1258 test. * iconvdata/tst-table-from.c (try): Reset the iconv descriptor before the main call, and flush it afterwards. (utf8_decode): Return a string, possibly containing several Unicode characters. (main): Update all utf8_decode calls. * iconvdata/CP1258.irreversible: New file. 2001-05-20 Bruno Haible <haible@clisp.cons.org> * iconv/gconv.c (__gconv): For flush without output, pass do_flush = 2. * iconv/skeleton.c: Distinguish do_flush = 1 and do_flush = 2. In the first case, set outbuf, outstart, outend, and call PREPARE_LOOP before EMIT_SHIFT_TO_INIT; then pass the output produced by this step down to the next step. In the second case, clear the state without calling EMIT_SHIFT_TO_INIT. * iconvdata/ibm930.c (EMIT_SHIFT_TO_INIT): Use outbuf instead of data->__outbuf, and outend instead of data->__outbufend. * iconvdata/ibm933.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/ibm935.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/ibm937.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/ibm939.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/iso-2022-cn.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/iso-2022-cn-ext.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/iso-2022-jp.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/iso-2022-kr.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/utf-7.c (EMIT_SHIFT_TO_INIT): Likewise. 2001-05-21 Jakub Jelinek <jakub@redhat.com> * elf/rtld.c (dl_main): Compute l_map_end for the main program. * elf/dl-sym.c (_dl_sym): Don't check for l_addr == 0. If match == _dl_loaded, caller can still come from the main program. (_dl_vsym): Likewise. * elf/dl-open.c (dl_open_worker): Don't check for l_addr == 0. * elf/dl-error.c (_dl_signal_error): Change NULL objname into "". * elf/restest2.c: New test. * elf/Makefile (tests): Add restest2. (restest2, LDFLAGS-restest2): Add rules.
76 lines
2.3 KiB
C
76 lines
2.3 KiB
C
/* Convert characters in input buffer using conversion descriptor to
|
|
output buffer.
|
|
Copyright (C) 1997, 1998, 1999, 2000, 2001 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_int.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;
|
|
int result;
|
|
|
|
if (cd == (__gconv_t) -1L)
|
|
return __GCONV_ILLEGAL_DESCRIPTOR;
|
|
|
|
last_step = cd->__nsteps - 1;
|
|
|
|
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,
|
|
cd->__data[last_step].__outbuf == NULL ? 2 : 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;
|
|
}
|