Update.

2000-11-09  Jakub Jelinek  <jakub@redhat.com>

	* locale/C-time.c (_nl_C_LC_TIME): Fix value for _NL_TIME_WEEK_1STWEEK.

2000-11-09  Jakub Jelinek  <jakub@redhat.com>

	* locale/programs/ld-paper.c (paper_output): Fix offset into width
	field.

diff --git a/ChangeLog b/ChangeLog
index db6bb96..7ced58f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-11-09  Jakub Jelinek  <jakub@redhat.com>
+
+       * locale/C-time.c (_nl_C_LC_TIME): Fix value for _NL_TIME_WEEK_1STWEEK.
+
+2000-11-09  Jakub Jelinek  <jakub@redhat.com>
+
+       * locale/programs/ld-paper.c (paper_output): Fix offset into width
+       field.
+
 2000-10-27  Bruno Haible  <haible@clisp.cons.org>
 
        * locale/programs/charmap.c (charmap_read): Verify ASCII

diff --git a/locale/C-time.c b/locale/C-time.c
index d205f49..17eed63 100644 (file)
--- a/locale/C-time.c
+++ b/locale/C-time.c
@@ -135,7 +135,7 @@ const struct locale_data _nl_C_LC_TIME =
     { wstr: (const uint32_t *) L"" },
     { string: "\7" },
     { word: 19971130 },
-    { word: 19971130 },
+    { string: "\4" },
     { string: "\7" },
     { string: "\1" },
     { string: "\1" },

diff --git a/locale/programs/ld-paper.c b/locale/programs/ld-paper.c
index 19cf225..2b7c6f4 100644 (file)
--- a/locale/programs/ld-paper.c
+++ b/locale/programs/ld-paper.c
@@ -138,7 +138,7 @@ paper_output (struct localedef_t *locale, struct charmap_t *charmap,
   iov[cnt].iov_len = 4;
   ++cnt;
 
-  idx[cnt - 2] = iov[0].iov_len + iov[1].iov_len;
+  idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
   iov[cnt].iov_base = &paper->width;
   iov[cnt].iov_len = 4;
   ++cnt;