Updated to fedora-glibc-20070731T1624cvs/fedora-glibc-2_6_90-1

5 files changed, 46 insertions, 10 deletions

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 301eabaa04..7a7a62fa2f 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,15 @@
+2007-07-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* locales/ar_SA (d_t_fmt, d_fmt, t_fmt, t_fmt_ampm): Replace %.1d
+	with supported %e and %.1H with %k.
+	* locales/dz_BT (t_fmt): Remove whitespace between % and H.
+
+2007-07-10  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #4773]
+	* Makefile: Add rules to build and run tst-strptime.
+	* tst-strptime.c: New file.
+
 2007-05-07  Ulrich Drepper  <drepper@redhat.com>
 
 	* locales/as_IN: Fix currency_symbol, abday for Sunday, abmon for
diff --git a/localedata/Makefile b/localedata/Makefile
index 6b9ce6531a..f599cff6eb 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -93,7 +93,7 @@ locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl            \
 
 tests = $(locale_test_suite) tst-digits tst-setlocale bug-iconv-trans \
 	tst-leaks tst-mbswcs6 tst-xlocale1 tst-xlocale2 bug-usesetlocale \
-	tst-strfmon1 tst-sscanf
+	tst-strfmon1 tst-sscanf tst-strptime
 ifeq (yes,$(build-shared))
 ifneq (no,$(PERL))
 tests: $(objpfx)mtrace-tst-leaks
@@ -285,6 +285,7 @@ tst-mbswcs6-ENV = $(TEST_MBWC_ENV)
 tst-xlocale1-ENV = $(TEST_MBWC_ENV)
 tst-xlocale2-ENV = $(TEST_MBWC_ENV)
 tst-strfmon1-ENV = $(TEST_MBWC_ENV)
+tst-strptime-ENV = $(TEST_MBWC_ENV)
 
 tst-setlocale-ENV = LOCPATH=$(common-objpfx)localedata LC_ALL=ja_JP.EUC-JP
 
diff --git a/localedata/locales/ar_SA b/localedata/locales/ar_SA
index f41190d521..81d8cbf020 100644
--- a/localedata/locales/ar_SA
+++ b/localedata/locales/ar_SA
@@ -294,16 +294,16 @@ END LC_NUMERIC
 
 
 % Set up the LC_TIME category
-% d_t_fmt	"%A %.1d %B %Y  %.1H:%M:%S"
-% d_fmt	"%A %.1d %B %Y"
-% t_fmt	"%.1H:%M:%S"
-% t_fmt_ampm	"%.1H:%M:%S"
+% d_t_fmt	"%A %e %B %Y  %k:%M:%S"
+% d_fmt	"%A %e %B %Y"
+% t_fmt	"%k:%M:%S"
+% t_fmt_ampm	"%k:%M:%S"
 
 LC_TIME
-d_t_fmt	"<U0025><U0041><U0020><U0025><U002E><U0031><U0064><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0020><U0025><U002E><U0031><U0048><U003A><U0025><U004D><U003A><U0025><U0053>"
-d_fmt	"<U0025><U0041><U0020><U0025><U002E><U0031><U0064><U0020><U0025><U0042><U0020><U0025><U0059>"
-t_fmt	"<U0025><U002E><U0031><U0048><U003A><U0025><U004D><U003A><U0025><U0053>"
-t_fmt_ampm	"<U0025><U002E><U0031><U0048><U003A><U0025><U004D><U003A><U0025><U0053>"
+d_t_fmt	"<U0025><U0041><U0020><U0025><U0065><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0020><U0025><U006B><U003A><U0025><U004D><U003A><U0025><U0053>"
+d_fmt	"<U0025><U0041><U0020><U0025><U0065><U0020><U0025><U0042><U0020><U0025><U0059>"
+t_fmt	"<U0025><U006B><U003A><U0025><U004D><U003A><U0025><U0053>"
+t_fmt_ampm	"<U0025><U006B><U003A><U0025><U004D><U003A><U0025><U0053>"
 day	"<U0627><U0644><U0623><U062D><U062F>"; /
 	"<U0627><U0644><U0625><U062B><U0646><U064A><U0646>"; /
 	"<U0627><U0644><U062B><U0644><U0627><U062B><U0627><U0621>"; /
diff --git a/localedata/locales/dz_BT b/localedata/locales/dz_BT
index a617e44ab8..596573797e 100644
--- a/localedata/locales/dz_BT
+++ b/localedata/locales/dz_BT
@@ -1293,7 +1293,7 @@ d_fmt        "<U0F54><U0F66><U0FB1><U0F72><U0F0B><U0F63><U0F7C>%y<U0F5F>/
 
 % Appropriate time representation  "%H:%M:%S"
 t_fmt        "<U0F46><U0F74><U0F0B><U0F5A><U0F7C><U0F51>/
-%   H<U0F40><U0F66><U0F62><U0F0B><U0F58>/
+%H<U0F40><U0F66><U0F62><U0F0B><U0F58>/
 %M<U0F40><U0F66><U0F62><U0F0B><U0F46>%S"
 
 % AM/PM signs
diff --git a/localedata/tst-strptime.c b/localedata/tst-strptime.c
new file mode 100644
index 0000000000..4ee4fcb78d
--- /dev/null
+++ b/localedata/tst-strptime.c
@@ -0,0 +1,23 @@
+#include <locale.h>
+#include <time.h>
+#include <stdio.h>
+
+static int
+do_test (void)
+{
+  if (setlocale (LC_ALL, "vi_VN.TCVN5712-1") == NULL)
+    {
+      puts ("cannot set locale");
+      return 1;
+    }
+  struct tm tm;
+  /* This is November in Vietnamese encoded using TCVN5712-1.  */
+  static const char s[] = "\
+\x54\x68\xb8\x6e\x67\x20\x6d\xad\xea\x69\x20\x6d\xe9\x74";
+  char *r = strptime (s, "%b", &tm);
+  printf ("r = %p, r-s = %ju, tm.tm_mon = %d\n", r, r - s, tm.tm_mon);
+  return r == NULL || r - s != 14 || tm.tm_mon != 10;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"