* locale/programs/ld-time.c (time_startup): Test for lr being
	nonzero, not time.

	* locale/programs/ld-numeric.c (numeric_finish): Don't crash if
	decimal_point is not defined.
This commit is contained in:
Ulrich Drepper 1999-11-21 06:02:35 +00:00
parent bece1bc4ec
commit 1ceb8afe3d
5 changed files with 19 additions and 3 deletions

View File

@ -1,5 +1,11 @@
1999-11-20 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/ld-time.c (time_startup): Test for lr being
nonzero, not time.
* locale/programs/ld-numeric.c (numeric_finish): Don't crash if
decimal_point is not defined.
* wctype/wctrans.c (wctrans): Use correct base index to access
extra mapping tables.

View File

@ -114,7 +114,13 @@ numeric_finish (struct localedef_t *locale, struct charmap_t *charmap)
/* The decimal point must not be empty. This is not said explicitly
in POSIX but ANSI C (ISO/IEC 9899) says in 4.4.2.1 it has to be
!= "". */
if (numeric->decimal_point[0] == '\0' && ! be_quiet && ! nothing)
if (numeric->decimal_point == NULL)
{
error (0, 0, _("%s: field `%s' not defined"),
"LC_NUMERIC", "decimal_point");
numeric->decimal_point = ".";
}
else if (numeric->decimal_point[0] == '\0' && ! be_quiet && ! nothing)
{
error (0, 0, _("\
%s: value for field `%s' must not be the empty string"),

View File

@ -115,7 +115,7 @@ time_startup (struct linereader *lr, struct localedef_t *locale,
locale->categories[LC_TIME].time =
(struct locale_time_t *) xcalloc (1, sizeof (struct locale_time_t));
if (time != NULL)
if (lr != NULL)
{
lr->translate_strings = 1;
lr->return_widestr = 1;

View File

@ -1,3 +1,7 @@
1999-11-20 Ulrich Drepper <drepper@cygnus.com>
* tests/test1.def: Correct ellipsis syntax.
1999-11-17 Ulrich Drepper <drepper@cygnus.com>
* charmaps/ISO-8859-1: Don't define values for non-printable

View File

@ -4,6 +4,6 @@ upper <A>
lower <a>
space <SP>
blank <SP>
alpha <A>;<a>;<b1>;...;<b3>
alpha <A>;<a>;<b1>..<b3>
END LC_CTYPE