aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--localedata/ChangeLog4
-rw-r--r--localedata/tst-strptime.c10
-rw-r--r--time/strptime_l.c3
4 files changed, 22 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a2a0cc3..45b00a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-27 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #6657]
+ * time/strptime_l.c: Don't clear s.era_cnt after successful match
+ of %EY.
+ Patch by Petr Baudis.
+
2008-06-26 Ulrich Drepper <drepper@redhat.com>
* resolv/res_debig.c (__p_type_syms): Add ns_t_dname entry.
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index a1ffc8d..1d3e10f 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-27 Ulrich Drepper <drepper@redhat.com>
+
+ * tst-strptime.c (do_test): Add test of %EY.
+
2008-06-25 Ulrich Drepper <drepper@redhat.com>
* tst-strptime.c (do_test): Add test for parsing era year
diff --git a/localedata/tst-strptime.c b/localedata/tst-strptime.c
index 2d4bb7c..bc2c7f1 100644
--- a/localedata/tst-strptime.c
+++ b/localedata/tst-strptime.c
@@ -37,6 +37,16 @@ r = %p, r-s2 = %tu, tm.tm_mday = %d, tm.tm_mon = %d, tm.tm_year = %d\n",
result |= (r == NULL || r - s2 != 14 || tm.tm_mday != 25 || tm.tm_mon != 5
|| tm.tm_year != 108);
+ static const char s3[] = "\
+\x32\x35\x20\x30\x36\x20\xe5\xb9\xb3\xe6\x88\x90\x32\x30\xe5\xb9\xb4\0";
+ memset (&tm, '\0', sizeof (tm));
+ r = strptime (s3, "%d %m %EY", &tm);
+ printf ("\
+r = %p, r-s3 = %tu, tm.tm_mday = %d, tm.tm_mon = %d, tm.tm_year = %d\n",
+ r, r - s3, tm.tm_mday, tm.tm_mon, tm.tm_year);
+ result |= (r == NULL || r - s3 != 17 || tm.tm_mday != 25 || tm.tm_mon != 5
+ || tm.tm_year != 108);
+
return result;
}
diff --git a/time/strptime_l.c b/time/strptime_l.c
index 59a557c..d5356d3 100644
--- a/time/strptime_l.c
+++ b/time/strptime_l.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2004, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2004, 2005, 2007, 2008 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
@@ -951,7 +951,6 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM)
else
{
s.decided = loc;
- s.era_cnt = -1;
break;
}