hush: beautify re_execute_shell more

[oweals/busybox.git] / console-tools / loadfont.c

diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 38dad3f32a2c2d43dcf8c4224e995bd9a00084b0..336418061ae2988fb181660ca3ee92036df4e242 100644 (file)
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -6,10 +6,34 @@
  *
  * Loads the console font, and possibly the corresponding screen map(s).
  * (Adapted for busybox by Matej Vela.)
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 #include "libbb.h"
 #include <sys/kd.h>
 
+#ifndef KDFONTOP
+#define KDFONTOP 0x4B72
+struct console_font_op {
+       unsigned op;            /* KD_FONT_OP_* */
+       unsigned flags;         /* KD_FONT_FLAG_* */
+       unsigned width, height;
+       unsigned charcount;
+       unsigned char *data;    /* font data with height fixed to 32 */
+};
+
+#define KD_FONT_OP_SET          0  /* Set font */
+#define KD_FONT_OP_GET          1  /* Get font */
+#define KD_FONT_OP_SET_DEFAULT  2  /* Set font to default,
+                                         data points to name / NULL */
+#define KD_FONT_OP_COPY         3  /* Copy from another console */
+
+#define KD_FONT_FLAG_OLD        0x80000000 /* Invoked via old interface */
+#define KD_FONT_FLAG_DONT_RECALC 1 /* Don't call adjust_height() */
+                                   /* (Used internally for PIO_FONT support) */
+#endif /* KDFONTOP */
+
+
 enum {
        PSF_MAGIC1 = 0x36,
        PSF_MAGIC2 = 0x04,
@@ -40,6 +64,28 @@ static void do_loadfont(int fd, unsigned char *inbuf, int unit, int fontsize)
        for (i = 0; i < fontsize; i++)
                memcpy(buf + (32 * i), inbuf + (unit * i), unit);
 
+       { /* KDFONTOP */
+               struct console_font_op cfo;
+
+               cfo.op = KD_FONT_OP_SET;
+               cfo.flags = 0;
+               cfo.width = 8;
+               cfo.height = unit;
+               cfo.charcount = fontsize;
+               cfo.data = (void*)buf;
+#if 0
+               if (!ioctl_or_perror(fd, KDFONTOP, &cfo, "KDFONTOP ioctl failed (will try PIO_FONTX)"))
+                       goto ret;  /* success */
+#else
+               xioctl(fd, KDFONTOP, &cfo);
+#endif
+       }
+
+#if 0
+/* These ones do not honour -C tty (they set font on current tty regardless)
+ * On x86, this distinction is visible on framebuffer consoles
+ * (regular character consoles may have only one shared font anyway)
+ */
 #if defined(PIO_FONTX) && !defined(__sparc__)
        {
                struct consolefontdesc cfd;
@@ -49,11 +95,12 @@ static void do_loadfont(int fd, unsigned char *inbuf, int unit, int fontsize)
                cfd.chardata = buf;
 
                if (!ioctl_or_perror(fd, PIO_FONTX, &cfd, "PIO_FONTX ioctl failed (will try PIO_FONT)"))
-                       goto ret;                       /* success */
+                       goto ret;  /* success */
        }
 #endif
        xioctl(fd, PIO_FONT, buf);
  ret:
+#endif /* 0 */
        free(buf);
 }
 
@@ -155,7 +202,7 @@ int loadfont_main(int argc UNUSED_PARAM, char **argv)
         * just read the entire file.
         */
        len = 32*1024; // can't be larger
-       psfhdr = (struct psf_header *) xmalloc_read(STDIN_FILENO, &len);
+       psfhdr = xmalloc_read(STDIN_FILENO, &len);
        // xmalloc_open_zipped_read_close(filename, &len);
        if (!psfhdr)
                bb_perror_msg_and_die("error reading input font");
@@ -233,16 +280,16 @@ int setfont_main(int argc UNUSED_PARAM, char **argv)
        fd = xopen(tty_name, O_NONBLOCK);
 
        if (sizeof(CONFIG_DEFAULT_SETFONT_DIR) > 1) { // if not ""
-               if (strchr(*argv, '/') != NULL) {
+               if (*argv[0] != '/') {
                        // goto default fonts location. don't die if doesn't exist
                        chdir(CONFIG_DEFAULT_SETFONT_DIR "/consolefonts");
-                       // buglet: we don't return to current dir...
-                       // affects "setfont FONT -m ./MAP" case
                }
        }
        // load font
        len = 32*1024; // can't be larger
-       psfhdr = (struct psf_header *) xmalloc_open_zipped_read_close(*argv, &len);
+       psfhdr = xmalloc_open_zipped_read_close(*argv, &len);
+       if (!psfhdr)
+               bb_simple_perror_msg_and_die(*argv);
        do_load(fd, psfhdr, len);
 
        // load the screen map, if any
@@ -251,7 +298,7 @@ int setfont_main(int argc UNUSED_PARAM, char **argv)
                void *map;
 
                if (sizeof(CONFIG_DEFAULT_SETFONT_DIR) > 1) { // if not ""
-                       if (strchr(mapfilename, '/') != NULL) {
+                       if (mapfilename[0] != '/') {
                                // goto default keymaps location
                                chdir(CONFIG_DEFAULT_SETFONT_DIR "/consoletrans");
                        }