projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch from Matt Kraai to enable proxy support.
[oweals/busybox.git]
/
loadfont.c
diff --git
a/loadfont.c
b/loadfont.c
index e93ca31868429d8795ca6691ff04a371ae98a6ff..13a196fb0c24159659c31791873a4564ce3f2e50 100644
(file)
--- a/
loadfont.c
+++ b/
loadfont.c
@@
-7,7
+7,7
@@
* 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 "
busybox
.h"
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
@@
-43,18
+43,15
@@
extern int loadfont_main(int argc, char **argv)
{
int fd;
{
int fd;
- if (argc
>=2 && *argv[1]=='-') {
+ if (argc
!= 1)
usage(loadfont_usage);
usage(loadfont_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)
@@
-64,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\n", 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);
@@
-82,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
@@
-126,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
M
sg("It seems this kernel is older than 1.1.92\n");
- error
Msg
("No Unicode mapping table loaded.\n");
+ error
_m
sg("It seems this kernel is older than 1.1.92\n");
+ error
_msg_and_die
("No Unicode mapping table loaded.\n");
} 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;
@@
-141,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");
}
}
}
}
@@
-158,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 */
{
@@
-186,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\n");
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\n");
#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\n");
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);
@@
-219,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\n");
offset = 0;
unit = inputlth / 256;
}
offset = 0;
unit = inputlth / 256;
}