- rel 2; verbose build by default; upstream nc fix; enable loadfont features in initrd

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

diff --git a/busybox-loadfont.patch b/busybox-loadfont.patch
index 1078565a76ad98cd67942ec266e13b3a37275d8b..1c2ef4857084fc14bb5cfa01724181ebc81c0242 100644 (file)
--- a/busybox-loadfont.patch
+++ b/busybox-loadfont.patch
@@ -1,26 +1,12 @@
-diff -Nur --exclude *~ busybox-0.51/loadfont.c busybox-0.51.new/loadfont.c
---- busybox-0.51/loadfont.c    Tue Feb 20 07:14:07 2001
-+++ busybox-0.51.new/loadfont.c        Tue Jun 12 14:49:58 2001
-@@ -155,8 +155,6 @@
-          maybe these do not occur: 16kB for the font,
-          and 16kB for the map leaves 32 unicode values
-          for each font position */
--      if (!feof(stdin))
--              perror_msg_and_die("Font too large");
+--- busybox-1.17.3/console-tools/loadfont.c.orig       2010-10-09 22:57:13.000000000 +0300
++++ busybox-1.17.3/console-tools/loadfont.c    2010-11-08 21:30:00.827185361 +0200
+@@ -274,9 +274,6 @@
+       table = font + fontsize * charsize;
+       buffer += len;
  
-       /* test for psf first */
-       {
-diff -Nur --exclude *~ busybox-0.51/loadfont.c busybox-0.51.new/loadfont.c
---- busybox-0.51/loadfont.c    Tue Jun 12 14:52:11 2001
-+++ busybox-0.51.new/loadfont.c        Tue Jun 12 15:16:20 2001
-@@ -183,8 +183,8 @@
-               head0 = sizeof(struct psf_header);
+-      if (table > buffer || (!has_table && table != buffer))
+-              bb_error_msg_and_die("input file: bad length");
+-
+       do_loadfont(fd, font, height, width, charsize, fontsize);
  
-               head = head0 + fontsize * unit;
--              if (head > inputlth || (!hastable && head != inputlth))
--                      error_msg_and_die("Input file: bad length");
-+              /* if (head > inputlth || (!hastable && head != inputlth))
-+                 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);
+       if (has_table)