- up for 1.12.2

[packages/busybox.git] / busybox-loadfont.patch

diff --git a/busybox-loadfont.patch b/busybox-loadfont.patch
index 5164e3cef09fb858f5cd4a12bcbf1520064fbdbf..666d7a4924156a4d1c97af79d06cfcd415baa90d 100644 (file)
--- a/busybox-loadfont.patch
+++ b/busybox-loadfont.patch
@@ -1,13 +1,13 @@
---- busybox-1.3.1/console-tools/loadfont.c.orig        2006-12-27 05:54:01.000000000 +0100
-+++ busybox-1.3.1/console-tools/loadfont.c     2006-12-30 12:29:56.698666552 +0100
-@@ -169,8 +169,10 @@
+--- busybox-1.12.2/console-tools/loadfont.c~   2008-11-19 12:27:34.314700966 +0100
++++ busybox-1.12.2/console-tools/loadfont.c    2008-11-19 12:28:35.598028789 +0100
+@@ -115,8 +115,10 @@
                head0 = sizeof(struct psf_header);
  
                head = head0 + fontsize * unit;
 +              /*
-               if (head > inputlth || (!hastable && head != inputlth))
+               if (head > len || (!hastable && head != len))
                        bb_error_msg_and_die("input file: bad length");
-+               */
-               do_loadfont(fd, inbuf + head0, unit, fontsize);
-               if (hastable)
-                       do_loadtable(fd, inbuf + head, inputlth - head, fontsize);
++              */
+       } else {
+               /* file with three code pages? */
+               if (len == 9780) {