OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

2000-07-07  Ulrich Drepper  <drepper@redhat.com>

	* locale/programs/locale.c (write_locales): Don't simply add all
	directories found in the subdir, test whether at least the
	LC_CTYPE file is in there.
This commit is contained in:
Ulrich Drepper 2000-07-07 07:12:11 +00:00
parent 2528edd317
commit 89a4f6ff1f
6 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2000-07-07 Ulrich Drepper <drepper@redhat.com>
* locale/programs/locale.c (write_locales): Don't simply add all
directories found in the subdir, test whether at least the
LC_CTYPE file is in there.
2000-07-06 Ulrich Drepper <drepper@redhat.com>
* iconvdata/euc-jp.c: Map characters in C1 area to itself.

15
locale/programs/locale.c
View File

@ -336,7 +336,20 @@ write_locales (void)
}
if (S_ISDIR (mode))
PUT (strdup (dirent->d_name));
{
/* Test whether at least the LC_CTYPE data is there. Some
directories only contain translations. */
char buf[sizeof (LOCALEDIR) + strlen (dirent->d_name)
+ sizeof "/LC_CTYPE"];
struct stat st;
stpcpy (stpcpy (stpcpy (stpcpy (buf, LOCALEDIR), "/"),
dirent->d_name),
"/LC_CTYPE");
if (stat (buf, &st) == 0 && S_ISREG (st.st_mode))
PUT (strdup (dirent->d_name));
}
}
closedir (dir);

5
localedata/ChangeLog
View File

@ -1,5 +1,10 @@
2000-07-06 Ulrich Drepper <drepper@redhat.com>
* tests-mbwc/dat_mblen.c: Correct data after adding C1 characters
to EUC-JP.
* tests-mbwc/dat_mbtowc.c: Likewise.
* tests-mbwc/dat_wctob.c: Likewise.
* charmaps/EUC-JP: Make characters in C1 area map to themselves.
* charmaps/EUC-KR: Likewise.

2
localedata/tests-mbwc/dat_mblen.c
View File

@ -100,7 +100,7 @@ TST_MBLEN tst_mblen_loc [] = {
/* 03: a character + an invalid byte. */
{ { 1, "\260\241\200", USE_MBCURMAX }, { 0, 0, 1, 2 } },
/* 04: control/invalid characters. */
{ { 1, "\200\202", USE_MBCURMAX }, { 1, EILSEQ, 1, -1 } },
{ { 1, "\377\202", USE_MBCURMAX }, { 1, EILSEQ, 1, -1 } },
/* 05: a null string. */
{ { 1, "", USE_MBCURMAX }, { 0, 0, 1, 0 } },
/* 06: a null pointer. */

9
localedata/tests-mbwc/dat_mbtowc.c
View File

@ -263,20 +263,19 @@ TST_MBTOWC tst_mbtowc_loc [] = {
{
{
{ 1, 1, "\177\244\242", MB_LEN_MAX },
{ 1, 1, "\200\244\242", MB_LEN_MAX },
{ 1, 1, "\377\244\242", MB_LEN_MAX },
{ 1, 1, "\201\244\242", MB_LEN_MAX },
}
},
{
{
{ 0, 0, 1, +1, 0x007F },
{ 0, 0, 1, +1, 0x007F },
#ifdef SHOJI_IS_RIGHT
{ 1, EILSEQ, 1, -1, 0x0000 },
{ 1, EILSEQ, 1, -1, 0x0000 },
#else
{ 0, 0, 1, -1, 0x0000 },
{ 0, 0, 1, -1, 0x0000 },
{ 0, 0, 1, -1, 0x0000 },
#endif
{ 0, 0, 1, +1, 0x0081 },
}
}
},

8
localedata/tests-mbwc/dat_wctob.c
View File

@ -42,12 +42,8 @@ TST_WCTOB tst_wctob_loc [] = {
{ { WEOF }, { 0,0, 1, EOF } },
{ { 0x0020 }, { 0,0, 1, 0x20 } },
{ { 0x0061 }, { 0,0, 1, 0x61 } },
#ifdef SHOJI_IS_RIGHT
{ { 0x0080 }, { 0,0, 1, 0x80 } }, /* <WAIVER> */
#else
/* XXX These are no valid characters. */
{ { 0x0080 }, { 0,0, 1, EOF } },
#endif
{ { 0x0080 }, { 0,0, 1, 0x80 } },
{ { 0x00FF }, { 0,0, 1, EOF } },
{ { 0x00C4 }, { 0,0, 1, EOF } },
{ { 0x30C4 }, { 0,0, 1, EOF } },
{ is_last: 1 } /* Last element. */