aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--locale/lc-time.c59
-rw-r--r--locale/localeinfo.h3
-rw-r--r--time/strptime.c69
4 files changed, 94 insertions, 43 deletions
diff --git a/ChangeLog b/ChangeLog
index 8332eab..28c6a24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2001-08-09 Ulrich Drepper <drepper@redhat.com>
+ * locale/lc-time.c (_nl_parse_alt_digit): New function.
+ * locale/localeinfo.h: Add prototype for it.
+ * time/strptime.c (get_alt_number): Use _nl_parse_alt_digit to get
+ the value. Correct computation of hour for %OI. If no %EC given
+ but %Ey use numeric formular.
+
* dlfcn/Makefile (tststatic-ENV): Also add $(common-objpfx)elf for
ld.so.
diff --git a/locale/lc-time.c b/locale/lc-time.c
index 545f83d..efa56b8 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-1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1995-1999, 2000, 2001 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
@@ -250,6 +250,63 @@ _nl_get_walt_digit (unsigned int number)
}
+int
+_nl_parse_alt_digit (const char **strp)
+{
+ const char *str = *strp;
+ int result = -1;
+ size_t cnt;
+ size_t maxlen = 0;
+
+ __libc_lock_lock (__libc_setlocale_lock);
+
+ if (alt_digits_initialized == 0)
+ {
+ alt_digits_initialized = 1;
+
+ if (alt_digits == NULL)
+ alt_digits = malloc (100 * sizeof (const char *));
+
+ if (alt_digits != NULL)
+ {
+ const char *ptr = _NL_CURRENT (LC_TIME, ALT_DIGITS);
+
+ if (alt_digits != NULL)
+ for (cnt = 0; cnt < 100; ++cnt)
+ {
+ alt_digits[cnt] = ptr;
+
+ /* Skip digit format. */
+ ptr = strchr (ptr, '\0') + 1;
+ }
+ }
+ }
+
+ /* Matching is not unambiguos. The alternative digits could be like
+ I, II, III, ... and the first one is a substring of the second
+ and third. Therefore we must keep on searching until we found
+ the longest possible match. Note that this is not specified in
+ the standard. */
+ for (cnt = 0; cnt < 100; ++cnt)
+ {
+ size_t len = strlen (alt_digits[cnt]);
+
+ if (len > maxlen && strncmp (alt_digits[cnt], str, len) == 0)
+ {
+ maxlen = len;
+ result = (int) cnt;
+ }
+ }
+
+ __libc_lock_unlock (__libc_setlocale_lock);
+
+ if (result != -1)
+ *strp += maxlen;
+
+ return result;
+}
+
+
static void
free_mem (void)
{
diff --git a/locale/localeinfo.h b/locale/localeinfo.h
index 24ddabe..e7528e9 100644
--- a/locale/localeinfo.h
+++ b/locale/localeinfo.h
@@ -205,6 +205,9 @@ extern const char *_nl_get_alt_digit (unsigned int number);
/* Similar, but now for wide characters. */
extern const wchar_t *_nl_get_walt_digit (unsigned int number);
+/* Parse string as alternative digit and return numeric value. */
+extern int _nl_parse_alt_digit (const char **strp);
+
/* Postload processing. */
extern void _nl_postload_ctype (void);
extern void _nl_postload_time (void);
diff --git a/time/strptime.c b/time/strptime.c
index 6764cfe..88b13f0 100644
--- a/time/strptime.c
+++ b/time/strptime.c
@@ -39,7 +39,7 @@
#ifndef __P
-# if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
+# if defined __GNUC__ || (defined __STDC__ && __STDC__)
# define __P(args) args
# else
# define __P(args) ()
@@ -101,47 +101,24 @@ localtime_r (t, tp)
#ifdef _NL_CURRENT
# define get_alt_number(from, to, n) \
({ \
- __label__ do_normal; \
- if (*decided != raw) \
- { \
- const char *alts = _NL_CURRENT (LC_TIME, ALT_DIGITS); \
- int __n = n; \
- int any = 0; \
- while (*rp == ' ') \
- ++rp; \
- val = 0; \
- do { \
- val *= 10; \
- while (*alts != '\0') \
- { \
- size_t len = strlen (alts); \
- if (strncasecmp (alts, rp, len) == 0) \
- break; \
- alts += len + 1; \
- ++val; \
- } \
- if (*alts == '\0') \
- { \
- if (*decided == not && ! any) \
- goto do_normal; \
- /* If we haven't read anything it's an error. */ \
- if (! any) \
- return NULL; \
- /* Correct the premature multiplication. */ \
- val /= 10; \
- break; \
- } \
- else \
- *decided = loc; \
- } while (--__n > 0 && val * 10 <= to); \
+ __label__ do_normal; \
+ \
+ if (*decided != raw) \
+ { \
+ val = _nl_parse_alt_digit (&rp); \
+ if (val == -1 && *decided != loc) \
+ { \
+ *decided = loc; \
+ goto do_normal; \
+ } \
if (val < from || val > to) \
return NULL; \
- } \
- else \
- { \
+ } \
+ else \
+ { \
do_normal: \
- get_number (from, to, n); \
- } \
+ get_number (from, to, n); \
+ } \
0; \
})
#else
@@ -770,6 +747,7 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
tm->tm_year = val;
want_era = 1;
want_xday = 1;
+ want_century = 1;
break;
case 'Y':
if (*decided != raw)
@@ -893,7 +871,7 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
/* Match hour in 12-hour clock using alternate numeric
symbols. */
get_alt_number (1, 12, 2);
- tm->tm_hour = val - 1;
+ tm->tm_hour = val % 12;
have_I = 1;
break;
case 'm':
@@ -963,7 +941,7 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
if (era_cnt != -1)
{
- era = _nl_select_era_entry(era_cnt);
+ era = _nl_select_era_entry (era_cnt);
if (want_era)
tm->tm_year = (era->start_date[0]
+ ((tm->tm_year - era->offset)
@@ -974,7 +952,12 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
}
else
if (want_era)
- return NULL;
+ {
+ /* No era found but we have seen an E modifier. Rectify some
+ values. */
+ if (want_century && century == -1 && tm->tm_year < 69)
+ tm->tm_year += 100;
+ }
if (want_xday && !have_wday)
{
@@ -993,8 +976,10 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
}
day_of_the_week (tm);
}
+
if (want_xday && !have_yday)
day_of_the_year (tm);
+
if ((have_uweek || have_wweek) && have_wday)
{
int save_wday = tm->tm_wday;