aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--locale/programs/ld-paper.c4
-rw-r--r--localedata/ChangeLog4
-rw-r--r--localedata/SUPPORTED1
4 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e2324d498..ec981dfa35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2001-02-13 Ulrich Drepper <drepper@redhat.com>
+ * locale/programs/ld-paper.c (paper_output): Pretty printing.
+
* iconvdata/Makefile (modules): Add GBBIG5.
(distribute): Add gbbig5.c.
* iconvdata/gconv-modules: Add entries for GBBIG5 module.
@@ -19,7 +21,7 @@
* io/ftw64.c: Likewise.
* sysdeps/unix/sysv/linux/ttyname.c: Likewise.
* sysdeps/unix/sysv/linux/ttyname_r.c: Likewise.
- * sysdeps/generic/glob.c: Likewise. Convert results if gl_readdir
+ * sysdeps/generic/glob.c: Likewise. Convert results of gl_readdir
callback to dirent. Still allow compiling outside glibc.
* sysdeps/gnu/glob64.c: Define COMPILE_GLOB64.
* sysdeps/unix/sysv/linux/i386/glob64.c: Likewise.
@@ -40,7 +42,7 @@
* include/unistd.h: Declare __ftruncate64.
- * sysdeps/generic/utmp_file.c: Use LFS functions and type.
+ * sysdeps/generic/utmp_file.c: Use LFS functions and types.
* sysdeps/unix/sysv/linux/getdents.c (__GETDENTS): Use __lseek64
instead of __lseek.
diff --git a/locale/programs/ld-paper.c b/locale/programs/ld-paper.c
index 776c780834..a3b54fd7d9 100644
--- a/locale/programs/ld-paper.c
+++ b/locale/programs/ld-paper.c
@@ -133,12 +133,12 @@ paper_output (struct localedef_t *locale, struct charmap_t *charmap,
iov[cnt].iov_len = sizeof (idx);
++cnt;
- idx[cnt - 2] = iov[0].iov_len + iov[1].iov_len;
+ idx[cnt - 2] = iov[cnt - 2].iov_len + iov[cnt - 1].iov_len;
iov[cnt].iov_base = &paper->height;
iov[cnt].iov_len = 4;
++cnt;
- idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
+ idx[cnt - 2] = idx[cnt - 2] + iov[cnt - 1].iov_len;
iov[cnt].iov_base = &paper->width;
iov[cnt].iov_len = 4;
++cnt;
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index fd270107fd..94c0dcc1d9 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-13 Ulrich Drepper <drepper@redhat.com>
+
+ * SUPPORTED: Add zh_CN.GBK.
+
2001-02-09 Andreas Jaeger <aj@suse.de>
* locales/en_IN: Add newline at end of file.
diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index 7e3c4333a4..64cc2026e8 100644
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -143,6 +143,7 @@ uk_UA KOI8-U
vi_VN UTF-8
zh_CN GB2312
zh_CN.GB18030 GB18030
+zh_CN.GBK GBK
zh_HK BIG5HKSCS
zh_TW BIG5
zh_TW.EUC-TW EUC-TW