diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-11-18 07:22:53 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-11-18 07:22:53 +0000 |
| commit | 5491da0dfa50a969aca174742c64e114fe068af4 (patch) | |
| tree | 06cf1a3e5b8b58cfbd76f575e6a2e0363c0ab61e /locale/programs/ld-time.c | |
| parent | 35946fb706d6333c5c11663fd0b46c1e9116ae0f (diff) | |
| download | glibc-5491da0dfa50a969aca174742c64e114fe068af4.zip glibc-5491da0dfa50a969aca174742c64e114fe068af4.tar.gz glibc-5491da0dfa50a969aca174742c64e114fe068af4.tar.bz2 | |
Update.
* locale/programs/ld-ctype.c (ctype_output): Correct computation of
nelems. Correctly compute index for additional character classes.
(ctype_read): Handle charclass and charconv definitions. Also
recognize arbitrary strings as mapping names.
* locale/programs/ld-time.c (time_finish): Correctly skip over wide
character era strings.
* locale/lc-time.c (_nl_get_era_entry): Correctly skip era name
and format for wide characters.
* time/strftime.c: Correctly determine era information for wide
wcsftime.
* wctrans.c: Fix after removal of second endianess table.
* wctype/wctype.h (_ISwbit): Correctly handle bits > 16.
Patches by Shinya Hanataka <hanataka@abyss.rim.or.jp>.
* wcsmbs/wcwidth.h (internal_wcwidth): Reject non-printable characters.
Diffstat (limited to 'locale/programs/ld-time.c')
| -rw-r--r-- | locale/programs/ld-time.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c index b08906e..9ec58f6 100644 --- a/locale/programs/ld-time.c +++ b/locale/programs/ld-time.c @@ -436,9 +436,10 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap) wstr = wstr ? wcschr (wstr + 1, L':') : NULL; /* end offset */ wstr = wstr ? wcschr (wstr + 1, L':') : NULL; /* end start */ wstr = wstr ? wcschr (wstr + 1, L':') : NULL; /* end end */ - time->era_entries[idx].wname = (uint32_t *) wstr; + time->era_entries[idx].wname = (uint32_t *) wstr + 1; wstr = wstr ? wcschr (wstr + 1, L':') : NULL; /* end name */ - time->era_entries[idx].wformat = (uint32_t *) wstr; + *wstr = L'\0'; + time->era_entries[idx].wformat = (uint32_t *) wstr + 1; } } |