mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-24 19:51:11 +00:00
fd1b5c0fb6
2000-04-09 Ulrich Drepper <drepper@redhat.com> Implement handling of restartable conversion functions according to ISO C. * iconv/gconv.h (__gconv_fct): Add additional parameter. * iconv/gconv_int.h (__BUILTIN_TRANS): Likewise. * iconv/gconv.c: Pass additional parameter to conversion function. * iconv/gconv_simple.c (internal_ucs4_loop_single): New function. (internal_ucs4le_loop_single): New function. (__gconv_transform_ascii_internal): Define ONE_DIRECTION. (__gconv_transform_internal_ascii): Likewise. (__gconv_transform_internal_utf8): Likewise. (__gconv_transform_utf8_internal): Likewise. (__gconv_transform_ucs2_internal): Likewise. (__gconv_transform_internal_ucs2): Likewise. (__gconv_transform_ucs2reverse_internal): Likewise. (__gconv_transform_internal_ucs2reverse): Likewise. (internal_ucs4le_loop_unaligned): Before return __GCONV_INCOMPLETE_INPUT check that the remaining bytes really form a valid character. Otherwise return __GCONV_ILLEGAL_INPUT. (__gconv_transform_utf8_internal): Define STORE_REST and UNPACK_BYTES. * iconv/loop.c: Fit in definition of function to convert one character for processing of left-over bytes from the state object. * iconv/skeleton.c (gconv): Rename inbuf to inptrp and inbufend to inend to match names in loop functions. (RESET_INPUT_BUFFER): Change apprpriately. (gconv): If needed, call function to process bytes from the state object. Similar at the end: store left over bytes if input is incomplete. Take extra argument and add new argument to all calls of the conversion function. * iconvdata/iso-2022-cn.c: Adjust numeric values used to store information in the state object to not conflict with length count. * iconvdata/iso-2022-jp.c: Likewise. * iconvdata/iso-2022-kr.c: Likewise. * iconvdata/unicode.c: Adjust for change change in parameters of skeleton function. * iconvdata/utf-16.c: Likewise. * libio/iofwide.c: Add new parameter to all calls of conversion function. * 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. * iconvdata/gbgbk.c: Always define MAX_NEEDED_OUTPUT and MAX_NEEDED_INPUT.
143 lines
4.0 KiB
C
143 lines
4.0 KiB
C
/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
|
|
|
|
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 <errno.h>
|
|
#include <gconv.h>
|
|
#include <wchar.h>
|
|
#include <wcsmbsload.h>
|
|
|
|
#include <assert.h>
|
|
|
|
#ifndef EILSEQ
|
|
# define EILSEQ EINVAL
|
|
#endif
|
|
|
|
|
|
/* This is the private state used if PS is NULL. */
|
|
static mbstate_t state;
|
|
|
|
/* This is a non-standard function but it is very useful in the
|
|
implementation of stdio because we have to deal with unterminated
|
|
buffers. At most NWC wide character will be converted. */
|
|
size_t
|
|
__wcsnrtombs (dst, src, nwc, len, ps)
|
|
char *dst;
|
|
const wchar_t **src;
|
|
size_t nwc;
|
|
size_t len;
|
|
mbstate_t *ps;
|
|
{
|
|
struct __gconv_step_data data;
|
|
const wchar_t *srcend;
|
|
int status;
|
|
size_t result;
|
|
struct __gconv_step *tomb;
|
|
|
|
/* Tell where we want the result. */
|
|
data.__invocation_counter = 0;
|
|
data.__internal_use = 1;
|
|
data.__is_last = 1;
|
|
data.__statep = ps ?: &state;
|
|
|
|
if (nwc == 0)
|
|
return 0;
|
|
srcend = *src + __wcsnlen (*src, nwc - 1) + 1;
|
|
|
|
/* Make sure we use the correct function. */
|
|
update_conversion_ptrs ();
|
|
|
|
/* Get the structure with the function pointers. */
|
|
tomb = __wcsmbs_gconv_fcts.tomb;
|
|
|
|
/* We have to handle DST == NULL special. */
|
|
if (dst == NULL)
|
|
{
|
|
unsigned char buf[256]; /* Just an arbitrary value. */
|
|
const wchar_t *inbuf = *src;
|
|
size_t dummy;
|
|
|
|
result = 0;
|
|
data.__outbufend = buf + sizeof (buf);
|
|
|
|
do
|
|
{
|
|
data.__outbuf = buf;
|
|
|
|
status = (*tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data,
|
|
(const unsigned char **) &inbuf,
|
|
(const unsigned char *) srcend, &dummy,
|
|
0, 1);
|
|
|
|
/* Count the number of bytes. */
|
|
result += data.__outbuf - buf;
|
|
}
|
|
while (status == __GCONV_FULL_OUTPUT);
|
|
|
|
if ((status == __GCONV_OK || status == __GCONV_EMPTY_INPUT)
|
|
&& data.__outbuf[-1] == '\0')
|
|
/* Don't count the NUL character in. */
|
|
--result;
|
|
}
|
|
else
|
|
{
|
|
/* This code is based on the safe assumption that all internal
|
|
multi-byte encodings use the NUL byte only to mark the end
|
|
of the string. */
|
|
size_t dummy;
|
|
|
|
data.__outbuf = dst;
|
|
data.__outbufend = dst + len;
|
|
|
|
status = (*tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data,
|
|
(const unsigned char **) src,
|
|
(const unsigned char *) srcend, &dummy, 0, 1);
|
|
|
|
/* Count the number of bytes. */
|
|
result = data.__outbuf - (unsigned char *) dst;
|
|
|
|
/* We have to determine whether the last character converted
|
|
is the NUL character. */
|
|
if ((status == __GCONV_OK || status == __GCONV_EMPTY_INPUT)
|
|
&& data.__outbuf[-1] == '\0')
|
|
{
|
|
assert (data.__outbuf != (unsigned char *) dst);
|
|
assert (__mbsinit (data.__statep));
|
|
*src = NULL;
|
|
--result;
|
|
}
|
|
}
|
|
|
|
/* There must not be any problems with the conversion but illegal input
|
|
characters. */
|
|
assert (status == __GCONV_OK || status == __GCONV_EMPTY_INPUT
|
|
|| status == __GCONV_ILLEGAL_INPUT
|
|
|| status == __GCONV_INCOMPLETE_INPUT
|
|
|| status == __GCONV_FULL_OUTPUT);
|
|
|
|
if (status != __GCONV_OK && status != __GCONV_FULL_OUTPUT
|
|
&& status != __GCONV_EMPTY_INPUT)
|
|
{
|
|
result = (size_t) -1;
|
|
__set_errno (EILSEQ);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
weak_alias (__wcsnrtombs, wcsnrtombs)
|