mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 23:10:06 +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.
131 lines
3.7 KiB
C
131 lines
3.7 KiB
C
/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
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. */
|
|
|
|
/* This header provides no interface for a user to the internals of
|
|
the gconv implementation in the libc. Therefore there is no use
|
|
for these definitions beside for writing additional gconv modules. */
|
|
|
|
#ifndef _GCONV_H
|
|
#define _GCONV_H 1
|
|
|
|
#include <features.h>
|
|
#define __need_mbstate_t
|
|
#include <wchar.h>
|
|
#define __need_size_t
|
|
#include <stddef.h>
|
|
|
|
/* ISO 10646 value used to signal invalid value. */
|
|
#define __UNKNOWN_10646_CHAR ((wchar_t) 0xfffd)
|
|
|
|
/* Error codes for gconv functions. */
|
|
enum
|
|
{
|
|
__GCONV_OK = 0,
|
|
__GCONV_NOCONV,
|
|
__GCONV_NODB,
|
|
__GCONV_NOMEM,
|
|
|
|
__GCONV_EMPTY_INPUT,
|
|
__GCONV_FULL_OUTPUT,
|
|
__GCONV_ILLEGAL_INPUT,
|
|
__GCONV_INCOMPLETE_INPUT,
|
|
|
|
__GCONV_ILLEGAL_DESCRIPTOR,
|
|
__GCONV_INTERNAL_ERROR
|
|
};
|
|
|
|
|
|
/* Forward declarations. */
|
|
struct __gconv_step;
|
|
struct __gconv_step_data;
|
|
struct __gconv_loaded_object;
|
|
|
|
|
|
/* Type of a conversion function. */
|
|
typedef int (*__gconv_fct) (struct __gconv_step *, struct __gconv_step_data *,
|
|
__const unsigned char **, __const unsigned char *,
|
|
size_t *, int, int);
|
|
|
|
/* Constructor and destructor for local data for conversion step. */
|
|
typedef int (*__gconv_init_fct) (struct __gconv_step *);
|
|
typedef void (*__gconv_end_fct) (struct __gconv_step *);
|
|
|
|
|
|
/* Description of a conversion step. */
|
|
struct __gconv_step
|
|
{
|
|
struct __gconv_loaded_object *__shlib_handle;
|
|
__const char *__modname;
|
|
|
|
int __counter;
|
|
|
|
__const char *__from_name;
|
|
__const char *__to_name;
|
|
|
|
__gconv_fct __fct;
|
|
__gconv_init_fct __init_fct;
|
|
__gconv_end_fct __end_fct;
|
|
|
|
/* Information about the number of bytes needed or produced in this
|
|
step. This helps optimizing the buffer sizes. */
|
|
int __min_needed_from;
|
|
int __max_needed_from;
|
|
int __min_needed_to;
|
|
int __max_needed_to;
|
|
|
|
/* Flag whether this is a stateful encoding or not. */
|
|
int __stateful;
|
|
|
|
void *__data; /* Pointer to step-local data. */
|
|
};
|
|
|
|
/* Additional data for steps in use of conversion descriptor. This is
|
|
allocated by the `init' function. */
|
|
struct __gconv_step_data
|
|
{
|
|
unsigned char *__outbuf; /* Output buffer for this step. */
|
|
unsigned char *__outbufend; /* Address of first byte after the output
|
|
buffer. */
|
|
|
|
/* Is this the last module in the chain. */
|
|
int __is_last;
|
|
|
|
/* Counter for number of invocations of the module function for this
|
|
descriptor. */
|
|
int __invocation_counter;
|
|
|
|
/* Flag whether this is an internal use of the module (in the mb*towc*
|
|
and wc*tomb* functions) or regular with iconv(3). */
|
|
int __internal_use;
|
|
|
|
__mbstate_t *__statep;
|
|
__mbstate_t __state; /* This element must not be used directly by
|
|
any module; always use STATEP! */
|
|
};
|
|
|
|
|
|
/* Combine conversion step description with data. */
|
|
typedef struct __gconv_info
|
|
{
|
|
size_t __nsteps;
|
|
struct __gconv_step *__steps;
|
|
struct __gconv_step_data __data[0];
|
|
} *__gconv_t;
|
|
|
|
#endif /* gconv.h */
|