mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
0e16ecfa1e
* locale/programs/ld-ctype.c (ctype_finish): Take all characters from the input charset into account when generating the hash table. (allocate_arrays): Correct setting default width. Not all empty slots in the table are filled, only those not covert explicitly by the locale description and in the charset. * stdio-common/vfscanf.c: Make sure to always return WEOF and EOF for wide character version. For %C handling, test correct pointer variable for NULL. * wcsmbs/wctob.c: Handle WEOF special. * wcsmbs/wcwidth.h: 0xff in width array means invalid character. * wctype/wctype.h: Protect gcc-isms with __extension__. Avoid always-true test to avoid warning.
74 lines
2.2 KiB
C
74 lines
2.2 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.ai.mit.edu>, 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>
|
|
|
|
|
|
int
|
|
wctob (c)
|
|
wint_t c;
|
|
{
|
|
char buf[MB_LEN_MAX];
|
|
struct __gconv_step_data data;
|
|
wchar_t inbuf[1];
|
|
wchar_t *inptr = inbuf;
|
|
size_t dummy;
|
|
int status;
|
|
|
|
if (c == WEOF)
|
|
return EOF;
|
|
|
|
/* Tell where we want the result. */
|
|
data.__outbuf = buf;
|
|
data.__outbufend = buf + MB_LEN_MAX;
|
|
data.__invocation_counter = 0;
|
|
data.__internal_use = 1;
|
|
data.__flags = __GCONV_IS_LAST;
|
|
data.__statep = &data.__state;
|
|
data.__trans = NULL;
|
|
|
|
/* 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.tomb->__fct,
|
|
(__wcsmbs_gconv_fcts.tomb, &data,
|
|
(const unsigned char **) &inptr,
|
|
(const unsigned char *) &inbuf[1],
|
|
NULL, &dummy, 0, 1));
|
|
|
|
/* The conversion failed or the output is too long. */
|
|
if ((status != __GCONV_OK && status != __GCONV_FULL_OUTPUT
|
|
&& status != __GCONV_EMPTY_INPUT)
|
|
|| data.__outbuf != (unsigned char *) (buf + 1))
|
|
return EOF;
|
|
|
|
return (unsigned char) buf[0];
|
|
}
|