projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gz_open and gz_close were left in, even when BB_FEATURE_TAR_GZIP was disabled.
[oweals/busybox.git]
/
loadfont.c
diff --git
a/loadfont.c
b/loadfont.c
index 622142925a53ace8a342fdfaf2335841737a2b37..1a724ca85e17cc07356a17844af904bc365641fb 100644
(file)
--- a/
loadfont.c
+++ b/
loadfont.c
@@
-7,7
+7,6
@@
* Loads the console font, and possibly the corresponding screen map(s).
* (Adapted for busybox by Matej Vela.)
*/
* Loads the console font, and possibly the corresponding screen map(s).
* (Adapted for busybox by Matej Vela.)
*/
-#include "internal.h"
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
@@
-15,20
+14,20
@@
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
-#include <sys/stat.h>
#include <dirent.h>
#include <errno.h>
#include <sys/ioctl.h>
#include <sys/kd.h>
#include <endian.h>
#include <dirent.h>
#include <errno.h>
#include <sys/ioctl.h>
#include <sys/kd.h>
#include <endian.h>
+#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 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 */
struct psf_header {
unsigned char magic1, magic2; /* Magic number */
@@
-44,18
+43,15
@@
extern int loadfont_main(int argc, char **argv)
{
int fd;
{
int fd;
- if (argc>=2 && *argv[1]=='-') {
- usage(loadfont_usage);
- }
+ if (argc != 1)
+ show_usage();
fd = open("/dev/tty0", O_RDWR);
fd = open("/dev/tty0", O_RDWR);
- if (fd < 0) {
- errorMsg("Error opening /dev/tty0: %s\n", strerror(errno));
- return( FALSE);
- }
+ if (fd < 0)
+ perror_msg_and_die("Error opening /dev/tty0");
loadnewfont(fd);
loadnewfont(fd);
- return
( TRUE)
;
+ return
EXIT_SUCCESS
;
}
static void do_loadfont(int fd, char *inbuf, int unit, int fontsize)
}
static void do_loadfont(int fd, char *inbuf, int unit, int fontsize)
@@
-65,10
+61,8
@@
static void do_loadfont(int fd, char *inbuf, int unit, int fontsize)
memset(buf, 0, sizeof(buf));
memset(buf, 0, sizeof(buf));
- if (unit < 1 || unit > 32) {
- errorMsg("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);
for (i = 0; i < fontsize; i++)
memcpy(buf + (32 * i), inbuf + (unit * i), unit);
@@
-83,13
+77,11
@@
static void do_loadfont(int fd, char *inbuf, int unit, int fontsize)
if (ioctl(fd, PIO_FONTX, &cfd) == 0)
return; /* success */
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
}
#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
}
static void
@@
-103,12
+95,8
@@
do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
u_short unicode;
maxct = tailsz; /* more than enough */
u_short unicode;
maxct = tailsz; /* more than enough */
- up = (struct unipair *) malloc(maxct * sizeof(struct unipair));
+ up = (struct unipair *)
x
malloc(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];
for (glyph = 0; glyph < fontsize; glyph++) {
while (tailsz >= 2) {
unicode = (((u_short) inbuf[1]) << 8) + inbuf[0];
@@
-131,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) {
if (ioctl(fd, PIO_UNIMAPCLR, &advice)) {
#ifdef ENOIOCTLCMD
if (errno == ENOIOCTLCMD) {
- error
Msg("It seems this kernel is older than 1.1.92\n
");
- error
Msg("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
} else
#endif
- perror("PIO_UNIMAPCLR");
- exit(1);
+ perror_msg_and_die("PIO_UNIMAPCLR");
}
ud.entry_ct = ct;
ud.entries = up;
}
ud.entry_ct = ct;
ud.entries = up;
@@
-146,8
+133,7
@@
do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
/* change advice parameters */
}
#endif
/* change advice parameters */
}
#endif
- perror("PIO_UNIMAP");
- exit(1);
+ perror_msg_and_die("PIO_UNIMAP");
}
}
}
}
@@
-163,18
+149,14
@@
static void loadnewfont(int fd)
* just read the entire file.
*/
inputlth = fread(inbuf, 1, sizeof(inbuf), stdin);
* 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 */
/* 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 */
{
/* test for psf first */
{
@@
-191,26
+173,20
@@
static void loadnewfont(int fd)
if (!PSF_MAGIC_OK(psfhdr))
goto no_psf;
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)
+ error_msg_and_die("Unsupported psf file mode");
fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256);
#if !defined( PIO_FONTX ) || defined( __sparc__ )
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 (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;
#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))
+ 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);
do_loadfont(fd, inbuf + head0, unit, fontsize);
if (hastable)
do_loadtable(fd, inbuf + head, inputlth - head, fontsize);
@@
-224,10
+200,8
@@
static void loadnewfont(int fd)
unit = 16;
} else {
/* bare font */
unit = 16;
} else {
/* bare font */
- if (inputlth & 0377) {
- errorMsg("Bad input file size\n");
- exit(1);
- }
+ if (inputlth & 0377)
+ error_msg_and_die("Bad input file size");
offset = 0;
unit = inputlth / 256;
}
offset = 0;
unit = inputlth / 256;
}