diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-06-28 04:27:24 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-06-28 04:27:24 +0000 |
| commit | 0e16ecfa1e7689c0b3be626f9a3441ebb5710c70 (patch) | |
| tree | 12a793be9d9a1f7a4a911239194bae33470dcb23 /localedata/tests-mbwc/dat_wcwidth.c | |
| parent | 37696206076f6f075542adfdc4b1fe49100e9f32 (diff) | |
| download | glibc-0e16ecfa1e7689c0b3be626f9a3441ebb5710c70.tar.gz glibc-0e16ecfa1e7689c0b3be626f9a3441ebb5710c70.tar.xz glibc-0e16ecfa1e7689c0b3be626f9a3441ebb5710c70.zip | |
Update.
* 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.
Diffstat (limited to 'localedata/tests-mbwc/dat_wcwidth.c')
| -rw-r--r-- | localedata/tests-mbwc/dat_wcwidth.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/localedata/tests-mbwc/dat_wcwidth.c b/localedata/tests-mbwc/dat_wcwidth.c index d57a3d4247..5472d1f559 100644 --- a/localedata/tests-mbwc/dat_wcwidth.c +++ b/localedata/tests-mbwc/dat_wcwidth.c @@ -28,10 +28,16 @@ TST_WCWIDTH tst_wcwidth_loc [] = { { /*inp*/ { 0x00C1 }, /* #06 */ /*exp*/ { 0,0, 1,1, }, }, +#ifdef SHOJI_IS_RIGHT /* <WAIVER> */ /* CHECK : wint_t */ { /*inp*/ { 0x3041 }, /* #07 */ /*exp*/ { 0,0, 1,0, }, }, +#else + { /*inp*/ { 0x3041 }, /* #07 */ + /*exp*/ { 0,0, 1,EOF, }, + }, +#endif { is_last: 1 } } }, @@ -50,15 +56,12 @@ TST_WCWIDTH tst_wcwidth_loc [] = { { /*inp*/ { 0x0080 }, /* #04 */ /*exp*/ { 0,0, 1,-1, }, }, - /* <WAIVER> */ /* assume ascii */ { /*inp*/ { 0x00A1 }, /* #05 */ /*exp*/ { 0,0, 1,-1, }, }, - /* <WAIVER> */ /* assume ascii */ { /*inp*/ { 0x00C1 }, /* #06 */ /*exp*/ { 0,0, 1,-1, }, }, - /* <WAIVER> */ /* CHECK : wint_t */ { /*inp*/ { 0x3041 }, /* #07 */ /*exp*/ { 0,0, 1,-1, }, }, @@ -80,10 +83,17 @@ TST_WCWIDTH tst_wcwidth_loc [] = { { /*inp*/ { 0x0080 }, /* #04 */ /*exp*/ { 0,0, 1,-1, }, }, +#ifdef SHOJI_IS_RIGHT /* <NO_WAIVER> */ { /*inp*/ { 0x00A1 }, /* #05 */ /*exp*/ { 0,0, 1,0, }, }, +#else + /* XXX U00A1 is a valid character in EUC-JP. */ + { /*inp*/ { 0x00A1 }, /* #05 */ + /*exp*/ { 0,0, 1,2, }, + }, +#endif /* jisx0212 */ { /*inp*/ { 0x00C1 }, /* #06 */ /*exp*/ { 0,0, 1,2, }, |