55985355ad
2000-06-12 Ulrich Drepper <drepper@redhat.com> * Rules (%.out): Define GCONV_PATH in the environment. * assert/Depend: New file. * iconvdata/Depend: New file. * intl/Depend: New file. * timezone/Makefile (build-testdata): Add GCONV_PATH to environment. * intl/tst-gettext.sh: Likewise. * iconv/Makefile (routines): Add gconv_trans. * iconv/gconv_trans.c: New file. * iconv/gconv.h (struct __gconv_trans_data): New type. (__gconv_fct): New parameter with starting position in output buffer. (__gconv_trans_fct, __gconv_trans_context_fct, __gconv_trans_query_fct, __gconv_trans_init_fct, __gconv_trans_end_fct): New types. (struct __gconv_step): Add new member __trans. * iconv/gconv_int.h: Pretty print prototypes. (gconv_transliterate): New prototype. (__BUILTIN_TRANS): Update for new conversion function interface. * iconv/gconv.c (__gconv): Pass new parameter to conversion function. * iconv/gconv_open.c (__gconv_open): Recognize error handling suffix in names, find appropriate function, and install in the conversion steps it can be used. * iconv/skeleton.c: Add additional parameter for beginning of output buffer. Change calls of downstream functions. * iconv/loop.c: Change loop function interface completely. Pass in step and step_data structure. Remove optimization for BODY with NEED_LENGTH_TEST == 0. * iconv/gconv_simple.c: Update interfaces of functions. Insert appropriate error handling code to use transliteration steps. Remove optimization for BODY with NEED_LENGTH_TEST == 0. * 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: Adjust to new interface of gconv functions. Use DL_CALL_FCT. * 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.
73 lines
2.3 KiB
C
73 lines
2.3 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 <dlfcn.h>
|
|
#include <gconv.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <wchar.h>
|
|
#include <wcsmbsload.h>
|
|
#include <limits.h>
|
|
|
|
|
|
wint_t
|
|
__btowc (c)
|
|
int c;
|
|
{
|
|
wchar_t result;
|
|
struct __gconv_step_data data;
|
|
unsigned char inbuf[1];
|
|
const unsigned char *inptr = inbuf;
|
|
size_t dummy;
|
|
int status;
|
|
|
|
/* If the parameter does not fit into one byte or it is the EOF value
|
|
we can give the answer now. */
|
|
if (c < SCHAR_MIN || c > UCHAR_MAX || c == EOF)
|
|
return WEOF;
|
|
|
|
/* Tell where we want the result. */
|
|
data.__outbuf = (unsigned char *) &result;
|
|
data.__outbufend = data.__outbuf + sizeof (wchar_t);
|
|
data.__invocation_counter = 0;
|
|
data.__internal_use = 1;
|
|
data.__flags = __GCONV_IS_LAST;
|
|
data.__statep = &data.__state;
|
|
|
|
/* Make sure we start in the initial state. */
|
|
memset (&data.__state, '\0', sizeof (mbstate_t));
|
|
|
|
/* Make sure we use the correct function. */
|
|
update_conversion_ptrs ();
|
|
|
|
/* Create the input string. */
|
|
inbuf[0] = c;
|
|
|
|
status = DL_CALL_FCT (__wcsmbs_gconv_fcts.towc->__fct,
|
|
(__wcsmbs_gconv_fcts.towc, &data, &inptr, inptr + 1,
|
|
data.__outbuf, &dummy, 0, 1));
|
|
/* The conversion failed. */
|
|
if (status != __GCONV_OK && status != __GCONV_FULL_OUTPUT
|
|
&& status != __GCONV_EMPTY_INPUT)
|
|
result = WEOF;
|
|
|
|
return result;
|
|
}
|
|
weak_alias (__btowc, btowc)
|