aboutsummaryrefslogtreecommitdiff
path: root/locale/C-time.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-08-31 07:04:41 +0000
committerUlrich Drepper <drepper@redhat.com>1999-08-31 07:04:41 +0000
commit4b10dd6c1959577f57850ca427a94fe22b9f3299 (patch)
treeb385d9b27e5a40d5baf7cd7e27c7cc5ef7129b5b /locale/C-time.c
parent1d1740d6b12894ed6a430e2e98bf73c5243b2925 (diff)
downloadglibc-4b10dd6c1959577f57850ca427a94fe22b9f3299.tar
glibc-4b10dd6c1959577f57850ca427a94fe22b9f3299.tar.gz
glibc-4b10dd6c1959577f57850ca427a94fe22b9f3299.tar.bz2
glibc-4b10dd6c1959577f57850ca427a94fe22b9f3299.zip
Update.
* locale/Makefile (distribute): Add iso-639.def and iso-3166.def. Change charset.h to charmap.h. (categories): Add new categories. Leave out collate for now. Update build rules. * locale/categories.def: Add definitions for new categories. * locale/langinfo.h: Likewise. * locale/locale.h: Likewise. * locale/C-address.c: New file. * locale/C-identification.c: New file. * locale/C-measurement.c: New file. * locale/C-name.c: New file. * locale/C-paper.c: New file. * locale/C-telephone.c: New file. * locale/lc-address.c: Likewise. * locale/lc-identification.c: Likewise. * locale/lc-measurement.c: Likewise. * locale/lc-name.c: Likewise. * locale/lc-paper.c: Likewise. * locale/lc-telephone.c: Likewise. * locale/C-ctype.c: Update for locale rewrite. * locale/C-messages.c: Likewise. * locale/C-monetary.c: Likewise. * locale/C-time.c: Likewise. * locale/lc-collate.c: Likewise. * locale/lc-ctype.c: Likewise. * locale/lc-monetary.c: Likewise. * locale/lc-time.c: Likewise. * locale/localeinfo.h: Likewise. * locale/newlocale.c: Likewise. * locale/setlocale.c: Likewise. * locale/weight.h: Likewise. * locale/findlocale.c: Unconditionally use mmap. Handle new categories. * locale/loadlocale.c: Likewise. * locale/iso-3166.def: New file. * locale/iso-639.def: New file. * locale/programs/charmap-kw.gperf: Add new keywords. * locale/programs/locfile-kw.gperf: Likewise. * locale/programs/locfile-token.h: Define new tokens. * locale/programs/charmap.c: Rewrite to handle multibyte charsets. * locale/programs/charmap.h: New file. * locale/programs/charset.h: Removed. * locale/programs/config.h: Add __LC_LAST. * locale/programs/lc-address.c: New file. * locale/programs/lc-identification.c: New file. * locale/programs/lc-measurement.c: New file. * locale/programs/lc-name.c: New file. * locale/programs/lc-paper.c: New file. * locale/programs/lc-telephone.c: New file. * locale/programs/lc-collate.c: Update for locale rewrite. * locale/programs/lc-ctype.c: Likewise. * locale/programs/lc-messages.c: Likewise. * locale/programs/lc-monetary.c: Likewise. * locale/programs/lc-numeric.c: Likewise. * locale/programs/lc-time.c: Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * locale/programs/locfile.c: Likewise. * locale/programs/repertoire.c: Likewise. * locale/programs/repertoire.h: Likewise. * locale/programs/locfile.c: Update prototypes. Update handle_copy definition. * locale/programs/linereader.c: Add handling of wide char strings and new definition file syntax. * locale/programs/linereader.h (struct token): Add elements for wide character strings. * locale/programs/locale-spec.c: Disable handling of collation elements for now. * locale/programs/simple-hash.h: Cleanup. * locale/programs/stringtrans.h: Handle quite of end of line. * string/strcoll.c: Fall back on strcmp for now. * string/strxfrm.c: Fall back on strncpy/strlen for now. * time/strftime.c: Use new wide character data for wcsftime. * time/strptime.c: Remove _nl_C_LC_TIME declaration. * wctype/cname-lookup.h: Update for new LC_CTYPE data.
Diffstat (limited to 'locale/C-time.c')
-rw-r--r--locale/C-time.c116
1 files changed, 62 insertions, 54 deletions
diff --git a/locale/C-time.c b/locale/C-time.c
index 6a846e4cae..34ed40507f 100644
--- a/locale/C-time.c
+++ b/locale/C-time.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
@@ -20,14 +20,15 @@
#include "localeinfo.h"
/* This table's entries are taken from POSIX.2 Table 2-11
- ``LC_TIME Category Definition in the POSIX Locale''. */
+ ``LC_TIME Category Definition in the POSIX Locale'',
+ with additions from ISO 14652, section 4.6. */
const struct locale_data _nl_C_LC_TIME =
{
_nl_C_name,
NULL, 0, 0, /* no file mapped */
UNDELETABLE,
- 104,
+ 62,
{
{ string: "Sun" },
{ string: "Mon" },
@@ -80,58 +81,65 @@ const struct locale_data _nl_C_LC_TIME =
{ string: "" },
{ string: "" },
{ word: 0 },
- { word: 0 },
- { string: "" },
- { string: "" },
- { wstr: L"Sun" },
- { wstr: L"Mon" },
- { wstr: L"Tue" },
- { wstr: L"Wed" },
- { wstr: L"Thu" },
- { wstr: L"Fri" },
- { wstr: L"Sat" },
- { wstr: L"Sunday" },
- { wstr: L"Monday" },
- { wstr: L"Tuesday" },
- { wstr: L"Wednesday" },
- { wstr: L"Thursday" },
- { wstr: L"Friday" },
- { wstr: L"Saturday" },
- { wstr: L"Jan" },
- { wstr: L"Feb" },
- { wstr: L"Mar" },
- { wstr: L"Apr" },
- { wstr: L"May" },
- { wstr: L"Jun" },
- { wstr: L"Jul" },
- { wstr: L"Aug" },
- { wstr: L"Sep" },
- { wstr: L"Oct" },
- { wstr: L"Nov" },
- { wstr: L"Dec" },
- { wstr: L"January" },
- { wstr: L"February" },
- { wstr: L"March" },
- { wstr: L"April" },
- { wstr: L"May" },
- { wstr: L"June" },
- { wstr: L"July" },
- { wstr: L"August" },
- { wstr: L"September" },
- { wstr: L"October" },
- { wstr: L"November" },
- { wstr: L"December" },
- { wstr: L"AM" },
- { wstr: L"PM" },
- { wstr: L"%a %b %e %H:%M:%S %Y" },
- { wstr: L"%m/%d/%y" },
- { wstr: L"%H:%M:%S" },
- { wstr: L"%I:%M:%S %p" },
- { string: NULL },
- { string: "" },
- { string: "" },
- { string: "" },
{ string: "" },
{ string: "" },
+ { wstr: (const uint32_t *) L"Sun" },
+ { wstr: (const uint32_t *) L"Mon" },
+ { wstr: (const uint32_t *) L"Tue" },
+ { wstr: (const uint32_t *) L"Wed" },
+ { wstr: (const uint32_t *) L"Thu" },
+ { wstr: (const uint32_t *) L"Fri" },
+ { wstr: (const uint32_t *) L"Sat" },
+ { wstr: (const uint32_t *) L"Sunday" },
+ { wstr: (const uint32_t *) L"Monday" },
+ { wstr: (const uint32_t *) L"Tuesday" },
+ { wstr: (const uint32_t *) L"Wednesday" },
+ { wstr: (const uint32_t *) L"Thursday" },
+ { wstr: (const uint32_t *) L"Friday" },
+ { wstr: (const uint32_t *) L"Saturday" },
+ { wstr: (const uint32_t *) L"Jan" },
+ { wstr: (const uint32_t *) L"Feb" },
+ { wstr: (const uint32_t *) L"Mar" },
+ { wstr: (const uint32_t *) L"Apr" },
+ { wstr: (const uint32_t *) L"May" },
+ { wstr: (const uint32_t *) L"Jun" },
+ { wstr: (const uint32_t *) L"Jul" },
+ { wstr: (const uint32_t *) L"Aug" },
+ { wstr: (const uint32_t *) L"Sep" },
+ { wstr: (const uint32_t *) L"Oct" },
+ { wstr: (const uint32_t *) L"Nov" },
+ { wstr: (const uint32_t *) L"Dec" },
+ { wstr: (const uint32_t *) L"January" },
+ { wstr: (const uint32_t *) L"February" },
+ { wstr: (const uint32_t *) L"March" },
+ { wstr: (const uint32_t *) L"April" },
+ { wstr: (const uint32_t *) L"May" },
+ { wstr: (const uint32_t *) L"June" },
+ { wstr: (const uint32_t *) L"July" },
+ { wstr: (const uint32_t *) L"August" },
+ { wstr: (const uint32_t *) L"September" },
+ { wstr: (const uint32_t *) L"October" },
+ { wstr: (const uint32_t *) L"November" },
+ { wstr: (const uint32_t *) L"December" },
+ { wstr: (const uint32_t *) L"AM" },
+ { wstr: (const uint32_t *) L"PM" },
+ { wstr: (const uint32_t *) L"%a %b %e %H:%M:%S %Y" },
+ { wstr: (const uint32_t *) L"%m/%d/%y" },
+ { wstr: (const uint32_t *) L"%H:%M:%S" },
+ { wstr: (const uint32_t *) L"%I:%M:%S %p" },
+ { wstr: NULL },
+ { wstr: (const uint32_t *) L"" },
+ { wstr: (const uint32_t *) L"" },
+ { wstr: (const uint32_t *) L"" },
+ { wstr: (const uint32_t *) L"" },
+ { wstr: (const uint32_t *) L"" },
+ { string: "\7" },
+ { word: 19971130 },
+ { word: 19971130 },
+ { string: "\7" },
+ { string: "\1" },
+ { string: "\7" },
+ { string: "\1" },
+ { string: "" }
}
};