X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=console-tools%2Floadfont.c;h=882b8817ad75c3658d2d2b9c7468e87fab6998ef;hb=482f2b31e788fdd849f78a3aa91cf6102fc98892;hp=622142925a53ace8a342fdfaf2335841737a2b37;hpb=bf181b9338152759fd56c8009e9a962a84808e7c;p=oweals%2Fbusybox.git diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c index 622142925..882b8817a 100644 --- a/console-tools/loadfont.c +++ b/console-tools/loadfont.c @@ -7,73 +7,41 @@ * Loads the console font, and possibly the corresponding screen map(s). * (Adapted for busybox by Matej Vela.) */ -#include "internal.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "libbb.h" #include -#include -#define PSF_MAGIC1 0x36 -#define PSF_MAGIC2 0x04 +enum { + PSF_MAGIC1 = 0x36, + PSF_MAGIC2 = 0x04, -#define PSF_MODE512 0x01 -#define PSF_MODEHASTAB 0x02 -#define PSF_MAXMODE 0x03 -#define PSF_SEPARATOR 0xFFFF + PSF_MODE512 = 0x01, + PSF_MODEHASTAB = 0x02, + PSF_MAXMODE = 0x03, + PSF_SEPARATOR = 0xFFFF +}; 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); - -extern int loadfont_main(int argc, char **argv) -{ - int fd; - - if (argc>=2 && *argv[1]=='-') { - usage(loadfont_usage); - } - - fd = open("/dev/tty0", O_RDWR); - if (fd < 0) { - errorMsg("Error opening /dev/tty0: %s\n", strerror(errno)); - return( FALSE); - } - loadnewfont(fd); - - return( TRUE); -} - -static void do_loadfont(int fd, char *inbuf, int unit, int fontsize) +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) { - errorMsg("Bad character size %d\n", unit); - exit(1); - } + 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; @@ -81,15 +49,13 @@ static void do_loadfont(int fd, char *inbuf, int unit, int fontsize) cfd.charheight = unit; cfd.chardata = buf; - if (ioctl(fd, PIO_FONTX, &cfd) == 0) - return; /* success */ - perror("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)) { - perror("PIO_FONT ioctl error"); - exit(1); - } + xioctl(fd, PIO_FONT, buf); + ret: + free(buf); } static void @@ -100,18 +66,14 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) struct unipair *up; int ct = 0, maxct; int glyph; - u_short unicode; + uint16_t unicode; maxct = tailsz; /* more than enough */ - up = (struct unipair *) malloc(maxct * sizeof(struct unipair)); + up = xmalloc(maxct * sizeof(struct unipair)); - if (!up) { - errorMsg("Out of memory?\n"); - exit(1); - } 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; if (unicode == PSF_SEPARATOR) @@ -128,60 +90,38 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) advice.advised_hashsize = 0; advice.advised_hashstep = 0; advice.advised_hashlevel = 0; - if (ioctl(fd, PIO_UNIMAPCLR, &advice)) { -#ifdef ENOIOCTLCMD - if (errno == ENOIOCTLCMD) { - errorMsg("It seems this kernel is older than 1.1.92\n"); - errorMsg("No Unicode mapping table loaded.\n"); - } else -#endif - perror("PIO_UNIMAPCLR"); - exit(1); - } + 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 - perror("PIO_UNIMAP"); - exit(1); - } + xioctl(fd, PIO_UNIMAP, &ud); } static void loadnewfont(int fd) { + enum { INBUF_SIZE = 32*1024 + 1 }; + int unit; - 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); /* * We used to look at the length of the input file * with stat(); now that we accept compressed files, * just read the entire file. */ - inputlth = fread(inbuf, 1, sizeof(inbuf), stdin); - if (ferror(stdin)) { - perror("Error reading input font"); - exit(1); - } - /* 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)) { - perror("Font too large"); - exit(1); - } + 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 */ { struct psf_header psfhdr; int fontsize; int hastable; - unsigned int head0, head; + unsigned head0, head; if (inputlth < sizeof(struct psf_header)) goto no_psf; @@ -191,45 +131,51 @@ static void loadnewfont(int fd) if (!PSF_MAGIC_OK(psfhdr)) goto no_psf; - if (psfhdr.mode > PSF_MAXMODE) { - errorMsg("Unsupported psf file mode\n"); - exit(1); - } + if (psfhdr.mode > PSF_MAXMODE) + bb_error_msg_and_die("unsupported psf file mode"); fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256); -#if !defined( PIO_FONTX ) || defined( __sparc__ ) - if (fontsize != 256) { - errorMsg("Only fontsize 256 supported\n"); - exit(1); - } +#if !defined(PIO_FONTX) || defined(__sparc__) + if (fontsize != 256) + bb_error_msg_and_die("only fontsize 256 supported"); #endif hastable = (psfhdr.mode & PSF_MODEHASTAB); unit = psfhdr.charsize; head0 = sizeof(struct psf_header); head = head0 + fontsize * unit; - if (head > inputlth || (!hastable && head != inputlth)) { - errorMsg("Input file: bad length\n"); - exit(1); - } + if (head > inputlth || (!hastable && head != inputlth)) + 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); return; } - no_psf: + no_psf: /* file with three code pages? */ if (inputlth == 9780) { offset = 40; unit = 16; } else { /* bare font */ - if (inputlth & 0377) { - errorMsg("Bad input file size\n"); - exit(1); - } + if (inputlth & 0377) + bb_error_msg_and_die("bad input file size"); offset = 0; unit = inputlth / 256; } do_loadfont(fd, inbuf + offset, unit, 256); } + +int loadfont_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +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; +}