aboutsummaryrefslogtreecommitdiff
path: root/locale/lc-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/lc-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/lc-time.c')
-rw-r--r--locale/lc-time.c117
1 files changed, 73 insertions, 44 deletions
diff --git a/locale/lc-time.c b/locale/lc-time.c
index a9344fcd33..77888bb666 100644
--- a/locale/lc-time.c
+++ b/locale/lc-time.c
@@ -1,5 +1,5 @@
/* Define current locale data for LC_TIME category.
- 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.
The GNU C Library is free software; you can redistribute it and/or
@@ -18,9 +18,11 @@
Boston, MA 02111-1307, USA. */
#include <bits/libc-lock.h>
+#include <endian.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
+#include <wchar.h>
#include "localeinfo.h"
_NL_CURRENT_DEFINE (LC_TIME);
@@ -36,7 +38,10 @@ static size_t num_eras;
static int alt_digits_initialized;
static const char **alt_digits;
-static size_t num_alt_digits;
+
+
+static int walt_digits_initialized;
+static const wchar_t **walt_digits;
void
@@ -45,6 +50,7 @@ _nl_postload_time (void)
/* Prepare lazy initialization of `era' and `alt_digits' array. */
era_initialized = 0;
alt_digits_initialized = 0;
+ walt_digits_initialized = 0;
}
@@ -58,8 +64,13 @@ _nl_get_era_entry (const struct tm *tp)
if (era_initialized == 0)
{
+#if __BYTE_ORDER == __LITTLE_ENDIAN
size_t new_num_eras = _NL_CURRENT_WORD (LC_TIME,
- _NL_TIME_ERA_NUM_ENTRIES);
+ _NL_TIME_ERA_NUM_ENTRIES_EL);
+#else
+ size_t new_num_eras = _NL_CURRENT_WORD (LC_TIME,
+ _NL_TIME_ERA_NUM_ENTRIES_EB);
+#endif
if (eras != NULL && new_num_eras == 0)
{
@@ -88,12 +99,17 @@ _nl_get_era_entry (const struct tm *tp)
/* Skip numeric values. */
ptr += sizeof (struct era_entry);
- /* Skip era name. */
+ /* Skip era name. */
ptr = strchr (ptr, '\0') + 1;
- /* Skip era format. */
+ /* Skip era format. */
ptr = strchr (ptr, '\0') + 1;
ptr += 3 - (((ptr - (const char *) eras[cnt]) + 3) & 3);
+
+ /* Skip wide era name. */
+ ptr = (char *) wcschr ((wchar_t *) ptr, '\0');
+ /* Skip wide era format. */
+ ptr = (char *) wcschr ((wchar_t *) ptr, '\0');
}
}
}
@@ -132,43 +148,28 @@ _nl_get_alt_digit (unsigned int number)
if (alt_digits_initialized == 0)
{
- size_t new_num_alt_digits = _NL_CURRENT_WORD (LC_TIME,
- _NL_TIME_NUM_ALT_DIGITS);
-
- if (alt_digits != NULL && new_num_alt_digits == 0)
- {
- free (alt_digits);
- alt_digits = NULL;
- }
- else if (new_num_alt_digits != 0)
- {
- if (num_alt_digits != new_num_alt_digits)
- alt_digits = realloc (alt_digits, (new_num_alt_digits
- * sizeof (const char *)));
+ alt_digits_initialized = 1;
- if (alt_digits == NULL)
- num_alt_digits = 0;
- else
- {
- const char *ptr = _NL_CURRENT (LC_TIME, ALT_DIGITS);
- size_t cnt;
+ if (alt_digits == NULL)
+ alt_digits = malloc (100 * sizeof (const char *));
- num_alt_digits = new_num_alt_digits;
+ if (alt_digits != NULL)
+ {
+ const char *ptr = _NL_CURRENT (LC_TIME, ALT_DIGITS);
+ size_t cnt;
- for (cnt = 0; cnt < num_alt_digits; ++cnt)
- {
- alt_digits[cnt] = ptr;
+ if (alt_digits != NULL)
+ for (cnt = 0; cnt < 100; ++cnt)
+ {
+ alt_digits[cnt] = ptr;
- /* Skip digit format. */
- ptr = strchr (ptr, '\0') + 1;
- }
- }
+ /* Skip digit format. */
+ ptr = strchr (ptr, '\0') + 1;
+ }
}
-
- alt_digits_initialized = 1;
}
- result = number < num_alt_digits ? alt_digits[number] : NULL;
+ result = alt_digits != NULL && number < 100 ? alt_digits[number] : NULL;
__libc_lock_unlock (__libc_setlocale_lock);
@@ -176,14 +177,42 @@ _nl_get_alt_digit (unsigned int number)
}
-/* Free all resources if necessary. */
-static void __attribute__ ((unused))
-free_mem (void)
+const wchar_t *
+_nl_get_walt_digit (unsigned int number)
{
- if (eras != NULL)
- free (eras);
- if (alt_digits != NULL)
- free (alt_digits);
-}
+ const wchar_t *result;
+
+ __libc_lock_lock (__libc_setlocale_lock);
+
+ if (walt_digits_initialized == 0)
+ {
+ walt_digits_initialized = 1;
+
+ if (walt_digits == NULL)
+ walt_digits = malloc (100 * sizeof (const uint32_t *));
+
+ if (walt_digits != NULL)
+ {
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+ const wchar_t *ptr = _NL_CURRENT_WSTR (LC_TIME, _NL_WALT_DIGITS_EL);
+#else
+ const wchar_t *ptr = _NL_CURRENT_WSTR (LC_TIME, _NL_WALT_DIGITS_EB);
+#endif
+ size_t cnt;
-text_set_element (__libc_subfreeres, free_mem);
+ for (cnt = 0; cnt < 100; ++cnt)
+ {
+ walt_digits[cnt] = ptr;
+
+ /* Skip digit format. */
+ ptr = wcschr (ptr, L'\0') + 1;
+ }
+ }
+ }
+
+ result = walt_digits != NULL && number < 100 ? walt_digits[number] : NULL;
+
+ __libc_lock_unlock (__libc_setlocale_lock);
+
+ return (wchar_t *) result;
+}