X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=console-tools%2Floadfont.c;h=d6650019554dd59cfb99d0d7a146cafdec38c2aa;hb=9c60b290717e3ff1b9a8e09da4abe6f46964aa82;hp=0f6afecd44b56cd856c330a784b64a0f2423f687;hpb=a6c752201e9031b51a6d89349f1cec1f690f56ef;p=oweals%2Fbusybox.git diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c index 0f6afecd4..d66500195 100644 --- a/console-tools/loadfont.c +++ b/console-tools/loadfont.c @@ -7,7 +7,6 @@ * Loads the console font, and possibly the corresponding screen map(s). * (Adapted for busybox by Matej Vela.) */ -#include "internal.h" #include #include #include @@ -15,23 +14,20 @@ #include #include #include -#include #include #include #include #include #include +#include "busybox.h" -#define PSF_MAGIC1 0x36 -#define PSF_MAGIC2 0x04 +static const int PSF_MAGIC1 = 0x36; +static const int PSF_MAGIC2 = 0x04; -#define PSF_MODE512 0x01 -#define PSF_MODEHASTAB 0x02 -#define PSF_MAXMODE 0x03 -#define PSF_SEPARATOR 0xFFFF - -static const char loadfont_usage[] = "loadfont\n\n" - "Loads a console font from standard input.\n"; +static const int PSF_MODE512 = 0x01; +static const int PSF_MODEHASTAB = 0x02; +static const int PSF_MAXMODE = 0x03; +static const int PSF_SEPARATOR = 0xFFFF; struct psf_header { unsigned char magic1, magic2; /* Magic number */ @@ -47,18 +43,15 @@ extern int loadfont_main(int argc, char **argv) { int fd; - if (argc>=2 && *argv[1]=='-') { - usage(loadfont_usage); - } + if (argc != 1) + show_usage(); - fd = open("/dev/tty0", O_RDWR); - if (fd < 0) { - fprintf(stderr, "Error opening /dev/tty0: %s\n", strerror(errno)); - return 1; - } + fd = open(CURRENT_VC, O_RDWR); + if (fd < 0) + perror_msg_and_die("Error opening " CURRENT_VC); loadnewfont(fd); - return 0; + return EXIT_SUCCESS; } static void do_loadfont(int fd, char *inbuf, int unit, int fontsize) @@ -68,10 +61,8 @@ static void do_loadfont(int fd, char *inbuf, int unit, int fontsize) memset(buf, 0, sizeof(buf)); - if (unit < 1 || unit > 32) { - fprintf(stderr, "Bad character size %d\n", unit); - exit(1); - } + if (unit < 1 || unit > 32) + error_msg_and_die("Bad character size %d", unit); for (i = 0; i < fontsize; i++) memcpy(buf + (32 * i), inbuf + (unit * i), unit); @@ -86,13 +77,11 @@ static void do_loadfont(int fd, char *inbuf, int unit, int fontsize) if (ioctl(fd, PIO_FONTX, &cfd) == 0) return; /* success */ - perror("PIO_FONTX ioctl error (trying PIO_FONT)"); + perror_msg("PIO_FONTX ioctl error (trying PIO_FONT)"); } #endif - if (ioctl(fd, PIO_FONT, buf)) { - perror("PIO_FONT ioctl error"); - exit(1); - } + if (ioctl(fd, PIO_FONT, buf)) + perror_msg_and_die("PIO_FONT ioctl error"); } static void @@ -106,12 +95,8 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) u_short unicode; maxct = tailsz; /* more than enough */ - up = (struct unipair *) malloc(maxct * sizeof(struct unipair)); + up = (struct unipair *) xmalloc(maxct * sizeof(struct unipair)); - if (!up) { - fprintf(stderr, "Out of memory?\n"); - exit(1); - } for (glyph = 0; glyph < fontsize; glyph++) { while (tailsz >= 2) { unicode = (((u_short) inbuf[1]) << 8) + inbuf[0]; @@ -134,12 +119,11 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) if (ioctl(fd, PIO_UNIMAPCLR, &advice)) { #ifdef ENOIOCTLCMD if (errno == ENOIOCTLCMD) { - fprintf(stderr, "It seems this kernel is older than 1.1.92\n"); - fprintf(stderr, "No Unicode mapping table loaded.\n"); + error_msg("It seems this kernel is older than 1.1.92"); + error_msg_and_die("No Unicode mapping table loaded."); } else #endif - perror("PIO_UNIMAPCLR"); - exit(1); + perror_msg_and_die("PIO_UNIMAPCLR"); } ud.entry_ct = ct; ud.entries = up; @@ -149,8 +133,7 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) /* change advice parameters */ } #endif - perror("PIO_UNIMAP"); - exit(1); + perror_msg_and_die("PIO_UNIMAP"); } } @@ -158,7 +141,7 @@ static void loadnewfont(int fd) { int unit; char inbuf[32768]; /* primitive */ - int inputlth, offset; + unsigned int inputlth, offset; /* * We used to look at the length of the input file @@ -166,25 +149,21 @@ static void loadnewfont(int fd) * just read the entire file. */ inputlth = fread(inbuf, 1, sizeof(inbuf), stdin); - if (ferror(stdin)) { - perror("Error reading input font"); - exit(1); - } + if (ferror(stdin)) + 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)) { - perror("Font too large"); - exit(1); - } + if (!feof(stdin)) + perror_msg_and_die("Font too large"); /* test for psf first */ { struct psf_header psfhdr; int fontsize; int hastable; - int head0, head; + unsigned int head0, head; if (inputlth < sizeof(struct psf_header)) goto no_psf; @@ -194,26 +173,20 @@ static void loadnewfont(int fd) if (!PSF_MAGIC_OK(psfhdr)) goto no_psf; - if (psfhdr.mode > PSF_MAXMODE) { - fprintf(stderr, "Unsupported psf file mode\n"); - exit(1); - } + if (psfhdr.mode > PSF_MAXMODE) + error_msg_and_die("Unsupported psf file mode"); fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256); #if !defined( PIO_FONTX ) || defined( __sparc__ ) - if (fontsize != 256) { - fprintf(stderr, "Only fontsize 256 supported\n"); - exit(1); - } + if (fontsize != 256) + 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)) { - fprintf(stderr, "Input file: bad length\n"); - exit(1); - } + 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); @@ -227,10 +200,8 @@ static void loadnewfont(int fd) unit = 16; } else { /* bare font */ - if (inputlth & 0377) { - fprintf(stderr, "Bad input file size\n"); - exit(1); - } + if (inputlth & 0377) + error_msg_and_die("Bad input file size"); offset = 0; unit = inputlth / 256; }