diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-10-26 23:41:17 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-10-26 23:41:17 +0000 |
| commit | d8337213c83c3bd4aa32e16669745dd7ee32b329 (patch) | |
| tree | c9f1296e2e3f355d296e4d8258c8380393006fc0 /locale/programs/ld-time.c | |
| parent | 5be068fc154b697b56cce171a73eccf572f86937 (diff) | |
| download | glibc-d8337213c83c3bd4aa32e16669745dd7ee32b329.tar.gz glibc-d8337213c83c3bd4aa32e16669745dd7ee32b329.tar.xz glibc-d8337213c83c3bd4aa32e16669745dd7ee32b329.zip | |
Update.
* locale/C-monetary.c: Set mon_decimal to empty string. Add missing entry _NL_MONETARY_CRNCYSTR. * stdio-common/printf_fp.c: If MON_DECIAL_POINT is not provided use DECIMAL_POINT information. * locale/C-numeric.c: Set mon_grouping entry to empty string. * locale/C-time.c: Add date_fmt entries. Remove two wrong entries. Correct value for number of entries. * locale/localeconv.c: Normalize result passed back in .grouping. Fix assignment to .int_* entries. * locale/Makefile (tests): Add tst-C-locale. * locale/tst-C-locale.c: New file. * locale/setlocale.c: Use LOCALEDIR and not LOCALE_PATH to locate locale files. * locale/newlocale.c: Likewise. 2000-10-26 GOTO Masanori <gotom@debian.or.jp> * locale/langinfo.h: Define _DATE_FMT and _NL_W_DATE_FMT. * locale/categories.def: New support for date_fmt. * locale/programs/ld-time.c: Likewise. * locale/programs/locfile-kw.gperf: Likewise. * locale/programs/locfile-kw.h: Likewise. * locale/programs/locfile-token.h: Likewise. 2000-10-26 Jakub Jelinek <jakub@redhat.com> * sysdeps/ieee754/ldbl-128/e_hypotl.c: New. * math/libm-test.inc (cabs_test, cexp_test, csqrt_test, hypot_test): Increase precision of constants. * sysdeps/alpha/fpu/libm-test-ulps: Update. * sysdeps/arm/libm-test-ulps: Update. * sysdeps/i386/fpu/libm-test-ulps: Update. * sysdeps/ia64/fpu/libm-test-ulps: Update. * sysdeps/m68k/fpu/libm-test-ulps: Update. * sysdeps/mips/fpu/libm-test-ulps: Update. * sysdeps/powerpc/fpu/libm-test-ulps: Update. * sysdeps/sparc/sparc32/fpu/libm-test-ulps: Update. * sysdeps/sparc/sparc64/fpu/libm-test-ulps: Update. * sysdeps/sh/sh4/fpu/libm-test-ulps: Update. * sysdeps/s390/fpu/libm-test-ulps: Update. 2000-10-26 Ulrich Drepper <drepper@redhat.com>
Diffstat (limited to 'locale/programs/ld-time.c')
| -rw-r--r-- | locale/programs/ld-time.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c index b42dba0100..ad4914a154 100644 --- a/locale/programs/ld-time.c +++ b/locale/programs/ld-time.c @@ -89,6 +89,8 @@ struct locale_time_t const uint32_t *wera_d_fmt; const char *alt_digits[100]; const uint32_t *walt_digits[100]; + const char *date_fmt; + const uint32_t *wdate_fmt; int alt_digits_defined; unsigned char week_ndays; uint32_t week_1stday; @@ -491,6 +493,11 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap) simply useless, stupid $&$!@... */ if (time->timezone == NULL) time->timezone = ""; + + if (time->date_fmt == NULL) + time->date_fmt = "%a %b %e %H:%M:%S %Z %Y"; + if (time->wdate_fmt == NULL) + time->wdate_fmt = (const uint32_t *) L"%a %b %e %H:%M:%S %Z %Y"; } @@ -849,6 +856,19 @@ time_output (struct localedef_t *locale, struct charmap_t *charmap, iov[2 + cnt].iov_base = (void *) time->timezone; iov[2 + cnt].iov_len = strlen (time->timezone) + 1; + idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len; + ++cnt; + ++last_idx; + + iov[2 + cnt].iov_base = (void *) time->date_fmt; + iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1; + idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len; + ++cnt; + ++last_idx; + + iov[2 + cnt].iov_base = (void *) time->wdate_fmt; + iov[2 + cnt].iov_len = ((wcslen (iov[2 + cnt].iov_base) + 1) + * sizeof (uint32_t)); ++cnt; ++last_idx; @@ -1080,6 +1100,7 @@ time_read (struct linereader *ldfile, struct localedef_t *result, STR_ELEM (era_d_fmt); STR_ELEM (era_t_fmt); STR_ELEM (timezone); + STR_ELEM (date_fmt); #define INT_ELEM(cat) \ case tok_##cat: \ |