summary refs log tree commit diff
path: root/locale/lc-time.c
diff options
context:
space:
mode:
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;
+}