Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/console-tools/loadfont.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/console-tools/loadfont.c (modified) (12 diffs)

branches/2.2.5/mindi-busybox/console-tools/loadfont.c

@@ -8 +8 @@
  * (Adapted for busybox by Matej Vela.)
  */
-#include <stdio.h>
-#include <string.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <errno.h>
-#include <sys/ioctl.h>
+#include "libbb.h"
 #include <sys/kd.h>
-#include <endian.h>
-#include "busybox.h"
 
-enum{
+enum {
     PSF_MAGIC1 = 0x36,
     PSF_MAGIC2 = 0x04,
@@ -32 +22 @@
 
 struct psf_header {
-    unsigned char magic1, magic2;   /* Magic number */
-    unsigned char mode;         /* PSF font mode */
-    unsigned char charsize;     /* Character size */
+    unsigned char magic1, magic2;   /* Magic number */
+    unsigned char mode;             /* PSF font mode */
+    unsigned char charsize;         /* Character size */
 };
 
 #define PSF_MAGIC_OK(x) ((x).magic1 == PSF_MAGIC1 && (x).magic2 == PSF_MAGIC2)
 
-static void loadnewfont(int fd);
-
-int loadfont_main(int argc, char **argv)
-{
-    int fd;
-
-    if (argc != 1)
-        bb_show_usage();
-
-    fd = bb_xopen(CURRENT_VC, O_RDWR);
-    loadnewfont(fd);
-
-    return EXIT_SUCCESS;
-}
-
 static void do_loadfont(int fd, unsigned char *inbuf, int unit, int fontsize)
 {
-    char buf[16384];
+    char *buf;
     int i;
 
-    memset(buf, 0, sizeof(buf));
+    if (unit < 1 || unit > 32)
+        bb_error_msg_and_die("bad character size %d", unit);
 
-    if (unit < 1 || unit > 32)
-        bb_error_msg_and_die("Bad character size %d", unit);
-
+    buf = xzalloc(16 * 1024);
+    /*memset(buf, 0, 16 * 1024);*/
     for (i = 0; i < fontsize; i++)
         memcpy(buf + (32 * i), inbuf + (unit * i), unit);
 
-#if defined( PIO_FONTX ) && !defined( __sparc__ )
+#if defined(PIO_FONTX) && !defined(__sparc__)
     {
         struct consolefontdesc cfd;
@@ -75 +50 @@
         cfd.chardata = buf;
 
-        if (ioctl(fd, PIO_FONTX, &cfd) == 0)
-            return;             /* success */
-        bb_perror_msg("PIO_FONTX ioctl error (trying PIO_FONT)");
+        if (!ioctl_or_perror(fd, PIO_FONTX, &cfd, "PIO_FONTX ioctl failed (will try PIO_FONT)"))
+            goto ret;           /* success */
     }
 #endif
-    if (ioctl(fd, PIO_FONT, buf))
-        bb_perror_msg_and_die("PIO_FONT ioctl error");
+    xioctl(fd, PIO_FONT, buf);
+ ret:
+    free(buf);
 }
 
@@ -92 +67 @@
     int ct = 0, maxct;
     int glyph;
-    u_short unicode;
+    uint16_t unicode;
 
     maxct = tailsz;             /* more than enough */
-    up = (struct unipair *) xmalloc(maxct * sizeof(struct unipair));
+    up = xmalloc(maxct * sizeof(struct unipair));
 
     for (glyph = 0; glyph < fontsize; glyph++) {
         while (tailsz >= 2) {
-            unicode = (((u_short) inbuf[1]) << 8) + inbuf[0];
+            unicode = (((uint16_t) inbuf[1]) << 8) + inbuf[0];
             tailsz -= 2;
             inbuf += 2;
@@ -116 +91 @@
     advice.advised_hashstep = 0;
     advice.advised_hashlevel = 0;
-    if (ioctl(fd, PIO_UNIMAPCLR, &advice)) {
-#ifdef ENOIOCTLCMD
-        if (errno == ENOIOCTLCMD) {
-            bb_error_msg("It seems this kernel is older than 1.1.92");
-            bb_error_msg_and_die("No Unicode mapping table loaded.");
-        } else
-#endif
-            bb_perror_msg_and_die("PIO_UNIMAPCLR");
-    }
+    xioctl(fd, PIO_UNIMAPCLR, &advice);
     ud.entry_ct = ct;
     ud.entries = up;
-    if (ioctl(fd, PIO_UNIMAP, &ud)) {
-#if 0
-        if (errno == ENOMEM) {
-            /* change advice parameters */
-        }
-#endif
-        bb_perror_msg_and_die("PIO_UNIMAP");
-    }
+    xioctl(fd, PIO_UNIMAP, &ud);
 }
 
 static void loadnewfont(int fd)
 {
+    enum { INBUF_SIZE = 32*1024 + 1 };
+
     int unit;
-    unsigned char inbuf[32768];         /* primitive */
-    unsigned int inputlth, offset;
+    unsigned inputlth, offset;
+    /* Was on stack, but 32k is a bit too much: */
+    unsigned char *inbuf = xmalloc(INBUF_SIZE);
 
     /*
@@ -148 +111 @@
      * just read the entire file.
      */
-    inputlth = fread(inbuf, 1, sizeof(inbuf), stdin);
-    if (ferror(stdin))
-        bb_perror_msg_and_die("Error reading input font");
-    /* use malloc/realloc in case of giant files;
-       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))
-        bb_perror_msg_and_die("Font too large");
+    inputlth = full_read(STDIN_FILENO, inbuf, INBUF_SIZE);
+    if (inputlth < 0)
+        bb_perror_msg_and_die("error reading input font");
+    if (inputlth >= INBUF_SIZE)
+        bb_error_msg_and_die("font too large");
 
     /* test for psf first */
@@ -163 +122 @@
         int fontsize;
         int hastable;
-        unsigned int head0, head;
+        unsigned head0, head;
 
         if (inputlth < sizeof(struct psf_header))
@@ -174 +133 @@
 
         if (psfhdr.mode > PSF_MAXMODE)
-            bb_error_msg_and_die("Unsupported psf file mode");
+            bb_error_msg_and_die("unsupported psf file mode");
         fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256);
-#if !defined( PIO_FONTX ) || defined( __sparc__ )
+#if !defined(PIO_FONTX) || defined(__sparc__)
         if (fontsize != 256)
-            bb_error_msg_and_die("Only fontsize 256 supported");
+            bb_error_msg_and_die("only fontsize 256 supported");
 #endif
         hastable = (psfhdr.mode & PSF_MODEHASTAB);
@@ -186 +145 @@
         head = head0 + fontsize * unit;
         if (head > inputlth || (!hastable && head != inputlth))
-            bb_error_msg_and_die("Input file: bad length");
+            bb_error_msg_and_die("input file: bad length");
         do_loadfont(fd, inbuf + head0, unit, fontsize);
         if (hastable)
@@ -192 +151 @@
         return;
     }
-  no_psf:
 
+ no_psf:
     /* file with three code pages? */
     if (inputlth == 9780) {
@@ -201 +160 @@
         /* bare font */
         if (inputlth & 0377)
-            bb_error_msg_and_die("Bad input file size");
+            bb_error_msg_and_die("bad input file size");
         offset = 0;
         unit = inputlth / 256;
@@ -207 +166 @@
     do_loadfont(fd, inbuf + offset, unit, 256);
 }
+
+int loadfont_main(int argc, char **argv);
+int loadfont_main(int argc, char **argv)
+{
+    int fd;
+
+    if (argc != 1)
+        bb_show_usage();
+
+    fd = xopen(CURRENT_VC, O_RDWR);
+    loadnewfont(fd);
+
+    return EXIT_SUCCESS;
+}