mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 19:30:10 +00: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.
48 lines
1.6 KiB
C
48 lines
1.6 KiB
C
/* Internal header containing implementation of wcwidth() function.
|
|
Copyright (C) 1996, 1997, 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 <wchar.h>
|
|
#include <wctype.h>
|
|
#include "../wctype/cname-lookup.h"
|
|
|
|
/* Array containing width information. */
|
|
extern unsigned char *__ctype_width;
|
|
|
|
/* If the program is compiled without optimization the following declaration
|
|
is not visible in the header. */
|
|
extern unsigned int *__ctype32_b;
|
|
|
|
static __inline int
|
|
internal_wcwidth (wint_t ch)
|
|
{
|
|
size_t idx;
|
|
unsigned char res;
|
|
|
|
if (ch == L'\0')
|
|
return 0;
|
|
|
|
idx = cname_lookup (ch);
|
|
if (idx == ~((size_t) 0) || (__ctype32_b[idx] & _ISwprint) == 0)
|
|
return -1;
|
|
|
|
res = __ctype_width[idx];
|
|
return res == (unsigned char) '\xff' ? -1 : (int) res;
|
|
}
|