emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added a new perrorMsg function, cleanup up error handling, fixed TRUE/FALSE

Browse Source 
uses, and other minor fixes.
This commit is contained in:
Matt Kraai 2000-10-25 17:00:36 +00:00
parent 9133c98a9d
commit ef5529b278
5 changed files with 66 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
busybox.h
View File

@ -345,6 +345,7 @@ extern const char *applet_name;
extern void usage(const char *usage) __attribute__ ((noreturn)); extern void usage(const char *usage) __attribute__ ((noreturn));
extern void errorMsg(const char *s, ...) __attribute__ ((format (printf, 1, 2))); extern void errorMsg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
extern void fatalError(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2))); extern void fatalError(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
extern void perrorMsg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
extern void fatalPerror(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2))); extern void fatalPerror(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
const char *modeString(int mode); const char *modeString(int mode);

69
console-tools/loadfont.c
View File

@ -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) { if (fd < 0)
errorMsg("Error opening /dev/tty0: %s\n", strerror(errno)); fatalPerror("Error opening /dev/tty0");
return( FALSE);
}
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) { if (unit < 1 || unit > 32)
errorMsg("Bad character size %d\n", unit); fatalError("Bad character size %d\n", unit);
exit(1);
}
for (i = 0; i < fontsize; i++) for (i = 0; i < fontsize; i++)
memcpy(buf + (32 * i), inbuf + (unit * i), unit); 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) if (ioctl(fd, PIO_FONTX, &cfd) == 0)
return; /* success */ return; /* success */
perror("PIO_FONTX ioctl error (trying PIO_FONT)"); perrorMsg("PIO_FONTX ioctl error (trying PIO_FONT)");
} }
#endif #endif
if (ioctl(fd, PIO_FONT, buf)) { if (ioctl(fd, PIO_FONT, buf))
perror("PIO_FONT ioctl error"); fatalPerror("PIO_FONT ioctl error");
exit(1);
}
} }
static void static void
@ -127,11 +120,10 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
#ifdef ENOIOCTLCMD #ifdef ENOIOCTLCMD
if (errno == ENOIOCTLCMD) { if (errno == ENOIOCTLCMD) {
errorMsg("It seems this kernel is older than 1.1.92\n"); errorMsg("It seems this kernel is older than 1.1.92\n");
errorMsg("No Unicode mapping table loaded.\n"); fatalError("No Unicode mapping table loaded.\n");
} else } else
#endif #endif
perror("PIO_UNIMAPCLR"); fatalPerror("PIO_UNIMAPCLR");
exit(1);
} }
ud.entry_ct = ct; ud.entry_ct = ct;
ud.entries = up; ud.entries = up;
@ -141,8 +133,7 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
/* change advice parameters */ /* change advice parameters */
} }
#endif #endif
perror("PIO_UNIMAP"); fatalPerror("PIO_UNIMAP");
exit(1);
} }
} }
@ -158,18 +149,14 @@ static void loadnewfont(int fd)
* just read the entire file. * just read the entire file.
*/ */
inputlth = fread(inbuf, 1, sizeof(inbuf), stdin); inputlth = fread(inbuf, 1, sizeof(inbuf), stdin);
if (ferror(stdin)) { if (ferror(stdin))
perror("Error reading input font"); fatalPerror("Error reading input font");
exit(1);
}
/* use malloc/realloc in case of giant files; /* use malloc/realloc in case of giant files;
maybe these do not occur: 16kB for the font, maybe these do not occur: 16kB for the font,
and 16kB for the map leaves 32 unicode values and 16kB for the map leaves 32 unicode values
for each font position */ for each font position */
if (!feof(stdin)) { if (!feof(stdin))
perror("Font too large"); fatalPerror("Font too large");
exit(1);
}
/* test for psf first */ /* test for psf first */
{ {
@ -186,26 +173,20 @@ static void loadnewfont(int fd)
if (!PSF_MAGIC_OK(psfhdr)) if (!PSF_MAGIC_OK(psfhdr))
goto no_psf; goto no_psf;
if (psfhdr.mode > PSF_MAXMODE) { if (psfhdr.mode > PSF_MAXMODE)
errorMsg("Unsupported psf file mode\n"); fatalError("Unsupported psf file mode\n");
exit(1);
}
fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256); fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256);
#if !defined( PIO_FONTX ) || defined( __sparc__ ) #if !defined( PIO_FONTX ) || defined( __sparc__ )
if (fontsize != 256) { if (fontsize != 256)
errorMsg("Only fontsize 256 supported\n"); fatalError("Only fontsize 256 supported\n");
exit(1);
}
#endif #endif
hastable = (psfhdr.mode & PSF_MODEHASTAB); hastable = (psfhdr.mode & PSF_MODEHASTAB);
unit = psfhdr.charsize; unit = psfhdr.charsize;
head0 = sizeof(struct psf_header); head0 = sizeof(struct psf_header);
head = head0 + fontsize * unit; head = head0 + fontsize * unit;
if (head > inputlth || (!hastable && head != inputlth)) { if (head > inputlth || (!hastable && head != inputlth))
errorMsg("Input file: bad length\n"); fatalError("Input file: bad length\n");
exit(1);
}
do_loadfont(fd, inbuf + head0, unit, fontsize); do_loadfont(fd, inbuf + head0, unit, fontsize);
if (hastable) if (hastable)
do_loadtable(fd, inbuf + head, inputlth - head, fontsize); do_loadtable(fd, inbuf + head, inputlth - head, fontsize);
@ -219,10 +200,8 @@ static void loadnewfont(int fd)
unit = 16; unit = 16;
} else { } else {
/* bare font */ /* bare font */
if (inputlth & 0377) { if (inputlth & 0377)
errorMsg("Bad input file size\n"); fatalError("Bad input file size\n");
exit(1);
}
offset = 0; offset = 0;
unit = inputlth / 256; unit = inputlth / 256;
} }

1
include/busybox.h
View File

@ -345,6 +345,7 @@ extern const char *applet_name;
extern void usage(const char *usage) __attribute__ ((noreturn)); extern void usage(const char *usage) __attribute__ ((noreturn));
extern void errorMsg(const char *s, ...) __attribute__ ((format (printf, 1, 2))); extern void errorMsg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
extern void fatalError(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2))); extern void fatalError(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
extern void perrorMsg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
extern void fatalPerror(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2))); extern void fatalPerror(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
const char *modeString(int mode); const char *modeString(int mode);

69
loadfont.c
View File

@ -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) { if (fd < 0)
errorMsg("Error opening /dev/tty0: %s\n", strerror(errno)); fatalPerror("Error opening /dev/tty0");
return( FALSE);
}
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) { if (unit < 1 || unit > 32)
errorMsg("Bad character size %d\n", unit); fatalError("Bad character size %d\n", unit);
exit(1);
}
for (i = 0; i < fontsize; i++) for (i = 0; i < fontsize; i++)
memcpy(buf + (32 * i), inbuf + (unit * i), unit); 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) if (ioctl(fd, PIO_FONTX, &cfd) == 0)
return; /* success */ return; /* success */
perror("PIO_FONTX ioctl error (trying PIO_FONT)"); perrorMsg("PIO_FONTX ioctl error (trying PIO_FONT)");
} }
#endif #endif
if (ioctl(fd, PIO_FONT, buf)) { if (ioctl(fd, PIO_FONT, buf))
perror("PIO_FONT ioctl error"); fatalPerror("PIO_FONT ioctl error");
exit(1);
}
} }
static void static void
@ -127,11 +120,10 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
#ifdef ENOIOCTLCMD #ifdef ENOIOCTLCMD
if (errno == ENOIOCTLCMD) { if (errno == ENOIOCTLCMD) {
errorMsg("It seems this kernel is older than 1.1.92\n"); errorMsg("It seems this kernel is older than 1.1.92\n");
errorMsg("No Unicode mapping table loaded.\n"); fatalError("No Unicode mapping table loaded.\n");
} else } else
#endif #endif
perror("PIO_UNIMAPCLR"); fatalPerror("PIO_UNIMAPCLR");
exit(1);
} }
ud.entry_ct = ct; ud.entry_ct = ct;
ud.entries = up; ud.entries = up;
@ -141,8 +133,7 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
/* change advice parameters */ /* change advice parameters */
} }
#endif #endif
perror("PIO_UNIMAP"); fatalPerror("PIO_UNIMAP");
exit(1);
} }
} }
@ -158,18 +149,14 @@ static void loadnewfont(int fd)
* just read the entire file. * just read the entire file.
*/ */
inputlth = fread(inbuf, 1, sizeof(inbuf), stdin); inputlth = fread(inbuf, 1, sizeof(inbuf), stdin);
if (ferror(stdin)) { if (ferror(stdin))
perror("Error reading input font"); fatalPerror("Error reading input font");
exit(1);
}
/* use malloc/realloc in case of giant files; /* use malloc/realloc in case of giant files;
maybe these do not occur: 16kB for the font, maybe these do not occur: 16kB for the font,
and 16kB for the map leaves 32 unicode values and 16kB for the map leaves 32 unicode values
for each font position */ for each font position */
if (!feof(stdin)) { if (!feof(stdin))
perror("Font too large"); fatalPerror("Font too large");
exit(1);
}
/* test for psf first */ /* test for psf first */
{ {
@ -186,26 +173,20 @@ static void loadnewfont(int fd)
if (!PSF_MAGIC_OK(psfhdr)) if (!PSF_MAGIC_OK(psfhdr))
goto no_psf; goto no_psf;
if (psfhdr.mode > PSF_MAXMODE) { if (psfhdr.mode > PSF_MAXMODE)
errorMsg("Unsupported psf file mode\n"); fatalError("Unsupported psf file mode\n");
exit(1);
}
fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256); fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256);
#if !defined( PIO_FONTX ) || defined( __sparc__ ) #if !defined( PIO_FONTX ) || defined( __sparc__ )
if (fontsize != 256) { if (fontsize != 256)
errorMsg("Only fontsize 256 supported\n"); fatalError("Only fontsize 256 supported\n");
exit(1);
}
#endif #endif
hastable = (psfhdr.mode & PSF_MODEHASTAB); hastable = (psfhdr.mode & PSF_MODEHASTAB);
unit = psfhdr.charsize; unit = psfhdr.charsize;
head0 = sizeof(struct psf_header); head0 = sizeof(struct psf_header);
head = head0 + fontsize * unit; head = head0 + fontsize * unit;
if (head > inputlth || (!hastable && head != inputlth)) { if (head > inputlth || (!hastable && head != inputlth))
errorMsg("Input file: bad length\n"); fatalError("Input file: bad length\n");
exit(1);
}
do_loadfont(fd, inbuf + head0, unit, fontsize); do_loadfont(fd, inbuf + head0, unit, fontsize);
if (hastable) if (hastable)
do_loadtable(fd, inbuf + head, inputlth - head, fontsize); do_loadtable(fd, inbuf + head, inputlth - head, fontsize);
@ -219,10 +200,8 @@ static void loadnewfont(int fd)
unit = 16; unit = 16;
} else { } else {
/* bare font */ /* bare font */
if (inputlth & 0377) { if (inputlth & 0377)
errorMsg("Bad input file size\n"); fatalError("Bad input file size\n");
exit(1);
}
offset = 0; offset = 0;
unit = inputlth / 256; unit = inputlth / 256;
} }

16
utility.c
View File

@ -109,6 +109,22 @@ extern void fatalError(const char *s, ...)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
extern void perrorMsg(const char *s, ...)
{
va_list p;
va_start(p, s);
fflush(stdout);
fprintf(stderr, "%s: ", applet_name);
if (s && *s) {
vfprintf(stderr, s, p);
fputs(": ", stderr);
}
fprintf(stderr, "%s\n", strerror(errno));
va_end(p);
fflush(stderr);
}
extern void fatalPerror(const char *s, ...) extern void fatalPerror(const char *s, ...)
{ {
va_list p; va_list p;