Update.
* wcsmbs/mbrtowc.c: Don't set errno if byte sequence is only incomplete but correct. * locale/programs/charmap.c: NUL-terminate names of generated
This commit is contained in:
parent
9deb2b365c
commit
1f547466cf
@ -1,6 +1,9 @@
|
||||
2000-01-18 Ulrich Drepper <drepper@cygnus.com>
|
||||
|
||||
* locale/programs/charmap.c: NUL-terminte names of generated
|
||||
* wcsmbs/mbrtowc.c: Don't set errno if byte sequence is only
|
||||
incomplete but correct.
|
||||
|
||||
* locale/programs/charmap.c: NUL-terminate names of generated
|
||||
entries for ellipsis.
|
||||
|
||||
2000-01-18 Andreas Jaeger <aj@suse.de>
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
|
||||
/* 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.
|
||||
|
||||
@ -90,9 +90,11 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
|
||||
else
|
||||
result = inbuf - (const unsigned char *) s;
|
||||
}
|
||||
else if (status == __GCONV_INCOMPLETE_INPUT)
|
||||
result = (size_t) -2;
|
||||
else
|
||||
{
|
||||
result = status == __GCONV_INCOMPLETE_INPUT ? (size_t) -2 : (size_t) -1;
|
||||
result = (size_t) -1;
|
||||
__set_errno (EILSEQ);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user