d620426811
2000-06-19 Ulrich Drepper <drepper@redhat.com> * iconv/gconv.h (__gconv_trans_fct): Add new parameter. General namespace cleanup. (struct __gconv_trans_data): Add next field. (struct __gconv_step_data): Make __trans a pointer. * iconv/gconv_conf.c: Split out code to find gconv directories from __gconv_read_conf in new functions. * iconv/gconv_int.h: Define new data structure and declare new functions for handling of gconv directory list. * iconv/gconv_open.c: Allow more than one error handling step being used. Call function to load error handling module if it is none of the builtin transformations. * iconv/gconv_close.c: Add code to free transliteration data. * iconv/gconv_trans.c: Add functions to load and unload modules implementing transliteration etc. * iconv/skeleton.c: Call all context functions now that more than one module is allowed. * iconv/loop.c (STANDARD_ERR_HANDLING): New macro. * iconv/gconv_simple.c: Use STANDARD_ERR_HANDLING macro for places where the full error handling using transliteration is needed. * 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. * libio/iofwide.c: Reset __trans member of __gconv_trans_data structure correctly after last change. * 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. * localedata/Makefile: Set -Wno-format for some files since gcc does not know all the format specifiers. 2000-06-18 Ulrich Drepper <drepper@redhat.com> * locale/loadlocale.c (_nl_unload_locale): Remove a bit of unneeded code. * locale/lc-time.c (_nl_init_era_entries): Likewise.
378 lines
10 KiB
C
378 lines
10 KiB
C
/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
|
|
This file is part of the GNU IO Library.
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License as
|
|
published by the Free Software Foundation; either version 2, or (at
|
|
your option) any later version.
|
|
|
|
This 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
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this library; see the file COPYING. If not, write to
|
|
the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
|
|
MA 02111-1307, USA.
|
|
|
|
As a special exception, if you link this library with files
|
|
compiled with a GNU compiler to produce an executable, this does
|
|
not cause the resulting executable to be covered by the GNU General
|
|
Public License. This exception does not however invalidate any
|
|
other reasons why the executable file might be covered by the GNU
|
|
General Public License. */
|
|
|
|
#include <libioP.h>
|
|
#ifdef _LIBC
|
|
# include <dlfcn.h>
|
|
# include <wchar.h>
|
|
#endif
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#ifdef _LIBC
|
|
# include <langinfo.h>
|
|
# include <locale/localeinfo.h>
|
|
# include <wcsmbs/wcsmbsload.h>
|
|
#endif
|
|
|
|
|
|
/* Prototypes of libio's codecvt functions. */
|
|
static enum __codecvt_result do_out (struct _IO_codecvt *codecvt,
|
|
__mbstate_t *statep,
|
|
const wchar_t *from_start,
|
|
const wchar_t *from_end,
|
|
const wchar_t **from_stop, char *to_start,
|
|
char *to_end, char **to_stop);
|
|
static enum __codecvt_result do_unshift (struct _IO_codecvt *codecvt,
|
|
__mbstate_t *statep, char *to_start,
|
|
char *to_end, char **to_stop);
|
|
static enum __codecvt_result do_in (struct _IO_codecvt *codecvt,
|
|
__mbstate_t *statep,
|
|
const char *from_start,
|
|
const char *from_end,
|
|
const char **from_stop, wchar_t *to_start,
|
|
wchar_t *to_end, wchar_t **to_stop);
|
|
static int do_encoding (struct _IO_codecvt *codecvt);
|
|
static int do_length (struct _IO_codecvt *codecvt, __mbstate_t *statep,
|
|
const char *from_start,
|
|
const char *from_end, _IO_size_t max);
|
|
static int do_max_length (struct _IO_codecvt *codecvt);
|
|
static int do_always_noconv (struct _IO_codecvt *codecvt);
|
|
|
|
|
|
/* The functions used in `codecvt' for libio are always the same. */
|
|
struct _IO_codecvt __libio_codecvt =
|
|
{
|
|
.__codecvt_destr = NULL, /* Destructor, never used. */
|
|
.__codecvt_do_out = do_out,
|
|
.__codecvt_do_unshift = do_unshift,
|
|
.__codecvt_do_in = do_in,
|
|
.__codecvt_do_encoding = do_encoding,
|
|
.__codecvt_do_always_noconv = do_always_noconv,
|
|
.__codecvt_do_length = do_length,
|
|
.__codecvt_do_max_length = do_max_length
|
|
};
|
|
|
|
|
|
/* Return orientation of stream. If mode is nonzero try to change
|
|
the orientation first. */
|
|
#undef _IO_fwide
|
|
int
|
|
_IO_fwide (fp, mode)
|
|
_IO_FILE *fp;
|
|
int mode;
|
|
{
|
|
/* Normalize the value. */
|
|
mode = mode < 0 ? -1 : (mode == 0 ? 0 : 1);
|
|
|
|
if (mode == 0 || fp->_mode != 0)
|
|
/* The caller simply wants to know about the current orientation
|
|
or the orientation already has been determined. */
|
|
return fp->_mode;
|
|
|
|
_IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
|
|
_IO_flockfile (fp);
|
|
|
|
/* Set the orientation appropriately. */
|
|
if (mode > 0)
|
|
{
|
|
fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_end;
|
|
fp->_wide_data->_IO_write_ptr = fp->_wide_data->_IO_write_base;
|
|
|
|
/* Clear the state. We start all over again. */
|
|
memset (&fp->_wide_data->_IO_state, '\0', sizeof (__mbstate_t));
|
|
memset (&fp->_wide_data->_IO_last_state, '\0', sizeof (__mbstate_t));
|
|
|
|
/* Get the character conversion functions based on the currently
|
|
selected locale for LC_CTYPE. */
|
|
#ifdef _LIBC
|
|
{
|
|
struct gconv_fcts fcts;
|
|
struct _IO_codecvt *cc = &fp->_wide_data->_codecvt;
|
|
|
|
__wcsmbs_clone_conv (&fcts);
|
|
|
|
/* The functions are always the same. */
|
|
*cc = __libio_codecvt;
|
|
|
|
cc->__cd_in.__cd.__nsteps = 1; /* Only one step allowed. */
|
|
cc->__cd_in.__cd.__steps = fcts.towc;
|
|
|
|
cc->__cd_in.__cd.__data[0].__invocation_counter = 0;
|
|
cc->__cd_in.__cd.__data[0].__internal_use = 1;
|
|
cc->__cd_in.__cd.__data[0].__flags = __GCONV_IS_LAST;
|
|
cc->__cd_in.__cd.__data[0].__statep = &fp->_wide_data->_IO_state;
|
|
|
|
/* XXX For now no transliteration. */
|
|
cc->__cd_in.__cd.__data[0].__trans = NULL;
|
|
|
|
cc->__cd_out.__cd.__nsteps = 1; /* Only one step allowed. */
|
|
cc->__cd_out.__cd.__steps = fcts.tomb;
|
|
|
|
cc->__cd_out.__cd.__data[0].__invocation_counter = 0;
|
|
cc->__cd_out.__cd.__data[0].__internal_use = 1;
|
|
cc->__cd_out.__cd.__data[0].__flags = __GCONV_IS_LAST;
|
|
cc->__cd_out.__cd.__data[0].__statep = &fp->_wide_data->_IO_state;
|
|
|
|
/* XXX For now no transliteration. */
|
|
cc->__cd_out.__cd.__data[0].__trans = NULL;
|
|
}
|
|
#else
|
|
# error "somehow determine this from LC_CTYPE"
|
|
#endif
|
|
|
|
/* From now on use the wide character callback functions. */
|
|
((struct _IO_FILE_plus *) fp)->vtable = fp->_wide_data->_wide_vtable;
|
|
}
|
|
|
|
/* Set the mode now. */
|
|
fp->_mode = mode;
|
|
|
|
_IO_funlockfile (fp);
|
|
_IO_cleanup_region_end (0);
|
|
|
|
return mode;
|
|
}
|
|
|
|
#ifdef weak_alias
|
|
weak_alias (_IO_fwide, fwide)
|
|
#endif
|
|
|
|
|
|
static enum __codecvt_result
|
|
do_out (struct _IO_codecvt *codecvt, __mbstate_t *statep,
|
|
const wchar_t *from_start, const wchar_t *from_end,
|
|
const wchar_t **from_stop, char *to_start, char *to_end,
|
|
char **to_stop)
|
|
{
|
|
enum __codecvt_result result;
|
|
|
|
#ifdef _LIBC
|
|
struct __gconv_step *gs = codecvt->__cd_out.__cd.__steps;
|
|
int status;
|
|
size_t dummy;
|
|
const unsigned char *from_start_copy = (unsigned char *) from_start;
|
|
|
|
codecvt->__cd_out.__cd.__data[0].__outbuf = to_start;
|
|
codecvt->__cd_out.__cd.__data[0].__outbufend = to_end;
|
|
codecvt->__cd_out.__cd.__data[0].__statep = statep;
|
|
|
|
status = DL_CALL_FCT (gs->__fct,
|
|
(gs, codecvt->__cd_out.__cd.__data, &from_start_copy,
|
|
(const unsigned char *) from_end, NULL,
|
|
&dummy, 0, 0));
|
|
|
|
*from_stop = (wchar_t *) from_start_copy;
|
|
*to_stop = codecvt->__cd_out.__cd.__data[0].__outbuf;
|
|
|
|
switch (status)
|
|
{
|
|
case __GCONV_OK:
|
|
case __GCONV_EMPTY_INPUT:
|
|
result = __codecvt_ok;
|
|
break;
|
|
|
|
case __GCONV_FULL_OUTPUT:
|
|
case __GCONV_INCOMPLETE_INPUT:
|
|
result = __codecvt_partial;
|
|
break;
|
|
|
|
default:
|
|
result = __codecvt_error;
|
|
break;
|
|
}
|
|
#else
|
|
/* Decide what to do. */
|
|
result = __codecvt_error;
|
|
#endif
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static enum __codecvt_result
|
|
do_unshift (struct _IO_codecvt *codecvt, __mbstate_t *statep,
|
|
char *to_start, char *to_end, char **to_stop)
|
|
{
|
|
enum __codecvt_result result;
|
|
|
|
#ifdef _LIBC
|
|
struct __gconv_step *gs = codecvt->__cd_out.__cd.__steps;
|
|
int status;
|
|
size_t dummy;
|
|
|
|
codecvt->__cd_out.__cd.__data[0].__outbuf = to_start;
|
|
codecvt->__cd_out.__cd.__data[0].__outbufend = to_end;
|
|
codecvt->__cd_out.__cd.__data[0].__statep = statep;
|
|
|
|
status = DL_CALL_FCT (gs->__fct,
|
|
(gs, codecvt->__cd_out.__cd.__data, NULL, NULL,
|
|
NULL, &dummy, 1, 0));
|
|
|
|
*to_stop = codecvt->__cd_out.__cd.__data[0].__outbuf;
|
|
|
|
switch (status)
|
|
{
|
|
case __GCONV_OK:
|
|
case __GCONV_EMPTY_INPUT:
|
|
result = __codecvt_ok;
|
|
break;
|
|
|
|
case __GCONV_FULL_OUTPUT:
|
|
case __GCONV_INCOMPLETE_INPUT:
|
|
result = __codecvt_partial;
|
|
break;
|
|
|
|
default:
|
|
result = __codecvt_error;
|
|
break;
|
|
}
|
|
#else
|
|
/* Decide what to do. */
|
|
result = __codecvt_error;
|
|
#endif
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static enum __codecvt_result
|
|
do_in (struct _IO_codecvt *codecvt, __mbstate_t *statep,
|
|
const char *from_start, const char *from_end, const char **from_stop,
|
|
wchar_t *to_start, wchar_t *to_end, wchar_t **to_stop)
|
|
{
|
|
enum __codecvt_result result;
|
|
|
|
#ifdef _LIBC
|
|
struct __gconv_step *gs = codecvt->__cd_in.__cd.__steps;
|
|
int status;
|
|
size_t dummy;
|
|
const unsigned char *from_start_copy = (unsigned char *) from_start;
|
|
|
|
codecvt->__cd_in.__cd.__data[0].__outbuf = (char *) to_start;
|
|
codecvt->__cd_in.__cd.__data[0].__outbufend = (char *) to_end;
|
|
codecvt->__cd_in.__cd.__data[0].__statep = statep;
|
|
|
|
status = DL_CALL_FCT (gs->__fct,
|
|
(gs, codecvt->__cd_in.__cd.__data, &from_start_copy,
|
|
from_end, NULL, &dummy, 0, 0));
|
|
|
|
*from_stop = from_start_copy;
|
|
*to_stop = (wchar_t *) codecvt->__cd_in.__cd.__data[0].__outbuf;
|
|
|
|
switch (status)
|
|
{
|
|
case __GCONV_OK:
|
|
case __GCONV_EMPTY_INPUT:
|
|
result = __codecvt_ok;
|
|
break;
|
|
|
|
case __GCONV_FULL_OUTPUT:
|
|
case __GCONV_INCOMPLETE_INPUT:
|
|
result = __codecvt_partial;
|
|
break;
|
|
|
|
default:
|
|
result = __codecvt_error;
|
|
break;
|
|
}
|
|
#else
|
|
/* Decide what to do. */
|
|
result = __codecvt_error;
|
|
#endif
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static int
|
|
do_encoding (struct _IO_codecvt *codecvt)
|
|
{
|
|
#ifdef _LIBC
|
|
/* See whether the encoding is stateful. */
|
|
if (codecvt->__cd_in.__cd.__steps[0].__stateful)
|
|
return -1;
|
|
/* Fortunately not. Now determine the input bytes for the conversion
|
|
necessary for each wide character. */
|
|
if (codecvt->__cd_in.__cd.__steps[0].__min_needed_from
|
|
!= codecvt->__cd_in.__cd.__steps[0].__max_needed_from)
|
|
/* Not a constant value. */
|
|
return 0;
|
|
|
|
return codecvt->__cd_in.__cd.__steps[0].__min_needed_from;
|
|
#else
|
|
/* Worst case scenario. */
|
|
return -1;
|
|
#endif
|
|
}
|
|
|
|
|
|
static int
|
|
do_always_noconv (struct _IO_codecvt *codecvt)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int
|
|
do_length (struct _IO_codecvt *codecvt, __mbstate_t *statep,
|
|
const char *from_start, const char *from_end, _IO_size_t max)
|
|
{
|
|
int result;
|
|
#ifdef _LIBC
|
|
const unsigned char *cp = (const unsigned char *) from_start;
|
|
wchar_t to_buf[max];
|
|
struct __gconv_step *gs = codecvt->__cd_in.__cd.__steps;
|
|
int status;
|
|
size_t dummy;
|
|
|
|
codecvt->__cd_in.__cd.__data[0].__outbuf = (char *) to_buf;
|
|
codecvt->__cd_in.__cd.__data[0].__outbufend = (char *) &to_buf[max];
|
|
codecvt->__cd_in.__cd.__data[0].__statep = statep;
|
|
|
|
status = DL_CALL_FCT (gs->__fct,
|
|
(gs, codecvt->__cd_in.__cd.__data, &cp, from_end,
|
|
NULL, &dummy, 0, 0));
|
|
|
|
result = cp - (const unsigned char *) from_start;
|
|
#else
|
|
/* Decide what to do. */
|
|
result = 0;
|
|
#endif
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static int
|
|
do_max_length (struct _IO_codecvt *codecvt)
|
|
{
|
|
#ifdef _LIBC
|
|
return codecvt->__cd_in.__cd.__steps[0].__max_needed_from;
|
|
#else
|
|
return MB_CUR_MAX;
|
|
#endif
|
|
}
|