qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* locale/programs/ld-ctype.c: Punt if character class definitions
	to not consists of tok_bsymbol (for now).
This commit is contained in:
Ulrich Drepper 1999-11-18 23:56:36 +00:00
parent 2be86203ea
commit 450f46015d
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
1999-11-18 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/ld-ctype.c: Punt if character class definitions
to not consists of tok_bsymbol (for now).
* time/strptime.c (day_of_the_week): Make sure result is never
negative.
(strptime_internal): Allow %C without %y.

5
locale/programs/ld-ctype.c
View File

@ -1835,6 +1835,11 @@ unknown character class `%s' in category `LC_CTYPE'"),
uint32_t wch;
struct charseq *seq;
if (now->tok != tok_bsymbol)
/* XXX Cannot be handled yet. We will have support
for tok_ucs4 soon. */
goto err_label;
if (ellipsis_token == tok_none)
{
if (get_character (now, charmap, repertoire, &seq, &wch))

12
time/strptime.c
View File

@ -235,7 +235,7 @@ day_of_the_week (struct tm *tm)
+ (((corr_year / 4) / 25) / 4)
+ __mon_yday[0][tm->tm_mon]
+ tm->tm_mday - 1);
tm->tm_wday = wday % 7;
tm->tm_wday = ((wday % 7) + 7) % 7;
}
/* Compute the day of the year. */
@ -830,8 +830,14 @@ strptime_internal (buf, format, tm, decided)
if (have_I && is_pm)
tm->tm_hour += 12;
if (want_century && century != -1)
tm->tm_year = tm->tm_year % 100 + (century - 19) * 100;
if (century != -1)
{
if (want_century)
tm->tm_year = tm->tm_year % 100 + (century - 19) * 100;
else
/* Only the century, but not the year. Strange, but so be it. */
tm->tm_year = (century - 19) * 100;
}
if (want_xday && !have_wday) {
if ( !(have_mon && have_mday) && have_yday) {