Update.

	* locale/programs/ld-paper.c (paper_output): Pretty printing.

	* sysdeps/generic/glob.c: Likewise.  Convert results of gl_readdir
	* sysdeps/generic/utmp_file.c: Use LFS functions and types.

diff --git a/ChangeLog b/ChangeLog
index 5e2324d498932277cce22185783b2f54f9e42bcb..ec981dfa353fa20bcb5c4bcd7f64a1afb624ad17 100644 (file)
--- 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 776c780834f985b9c1c1aa99270c0f2520e9c51c..a3b54fd7d99297f7b83ca9f1fdb2ba513f613ab7 100644 (file)
--- 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 fd270107fd6a918a467a9218d00290efb59a6e8e..94c0dcc1d9e158c92023df66823648c639afe61d 100644 (file)
--- 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 7e3c4333a41f4dc64a8ba665a540ed0f0873066a..64cc2026e8ee316e26d0a4c4eacf9827f6f0caa6 100644 (file)
--- 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