about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-11-09 17:12:56 +0000
committerUlrich Drepper <drepper@redhat.com>2000-11-09 17:12:56 +0000
commita3212d846b4e351ad076f37b5a8906e36c00bbac (patch)
treee3827f1d8a29eb81221d7109d4891e7dbe23bee2
parentbb39c4ef8f3f54d36462ea271cdcbc648b7409d7 (diff)
downloadglibc-a3212d846b4e351ad076f37b5a8906e36c00bbac.tar.gz
glibc-a3212d846b4e351ad076f37b5a8906e36c00bbac.tar.xz
glibc-a3212d846b4e351ad076f37b5a8906e36c00bbac.zip
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.
-rw-r--r--ChangeLog9
-rw-r--r--locale/C-time.c2
-rw-r--r--locale/programs/ld-paper.c2
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index db6bb964be..7ced58fc4d 100644
--- 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 d205f4918c..17eed63ae1 100644
--- 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 19cf22587c..2b7c6f4f8e 100644
--- 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;