3c720987c5
1998-04-07 20:32 Ulrich Drepper <drepper@cygnus.com> * wcsmbs/btowc.c: Fix dozends of bugs in untested code. * 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. * iconv/gconv-simple.c (__gconv_transform_ascii_ucs4): Compute position of next output character correctly. (__gconv_transform_ucs4_ascii): Count used input bytes correctly. * stdio-common/vfprintf.c (vfprintf): Clear state before used. * stdlib/strtod.c: Don't use mbtowc. 1998-04-07 19:07 H.J. Lu <hjl@gnu.org> * libio/fileops.c (_IO_file_xsgetn): Call __underflow () when what we want is smaller than a buffer. 1998-04-07 18:14 Ulrich Drepper <drepper@cygnus.com> * elf/dl-support.c (_dl_important_hwcaps): Define dummy version of this function.
97 lines
2.8 KiB
C
97 lines
2.8 KiB
C
/* Copyright (C) 1996, 1997, 1998 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 <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;
|
|
|
|
size_t
|
|
__mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
|
|
{
|
|
wchar_t buf[1];
|
|
struct gconv_step_data data;
|
|
size_t inbytes;
|
|
int status;
|
|
size_t result;
|
|
|
|
/* Tell where we want the result. */
|
|
data.outbuf = (char *) (pwc ?: buf);
|
|
data.outbufavail = 0;
|
|
data.outbufsize = sizeof (wchar_t);
|
|
data.is_last = 1;
|
|
data.statep = ps ?: &state;
|
|
|
|
/* A first special case is if S is NULL. This means put PS in the
|
|
initial state. */
|
|
if (s == NULL)
|
|
{
|
|
data.outbuf = (char *) buf;
|
|
s = "";
|
|
n = 1;
|
|
}
|
|
|
|
/* Make sure we use the correct function. */
|
|
update_conversion_ptrs ();
|
|
|
|
/* Do a normal conversion. */
|
|
inbytes = n;
|
|
status = (*__wcsmbs_gconv_fcts.towc->fct) (__wcsmbs_gconv_fcts.towc,
|
|
&data, s, &inbytes, NULL, 0);
|
|
|
|
/* There must not be any problems with the conversion but illegal input
|
|
characters. The output buffer must be large enough, otherwise the
|
|
definition of MB_CUR_MAX is not correct. All the other possible
|
|
errors also must not happen. */
|
|
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_EMPTY_INPUT
|
|
|| status == GCONV_FULL_OUTPUT)
|
|
{
|
|
if (data.outbufavail > 0 && *(wchar_t *)data.outbuf == L'\0')
|
|
{
|
|
/* The converted character is the NUL character. */
|
|
assert (mbsinit (data.statep));
|
|
result = 0;
|
|
}
|
|
else
|
|
result = n - inbytes;
|
|
}
|
|
else
|
|
{
|
|
result = status == GCONV_INCOMPLETE_INPUT ? (size_t) -2 : (size_t) -1;
|
|
__set_errno (EILSEQ);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
weak_alias (__mbrtowc, mbrtowc)
|