diff options
Diffstat (limited to 'console-tools')
| -rw-r--r-- | console-tools/chvt.c | 6 | ||||
| -rw-r--r-- | console-tools/deallocvt.c | 4 | ||||
| -rw-r--r-- | console-tools/dumpkmap.c | 8 | ||||
| -rw-r--r-- | console-tools/loadfont.c | 20 | ||||
| -rw-r--r-- | console-tools/setconsole.c | 4 | ||||
| -rw-r--r-- | console-tools/setkeycodes.c | 6 | ||||
| -rw-r--r-- | console-tools/setlogcons.c | 3 |
7 files changed, 16 insertions, 35 deletions
diff --git a/console-tools/chvt.c b/console-tools/chvt.c index e8761d523..86d3f2ddb 100644 --- a/console-tools/chvt.c +++ b/console-tools/chvt.c @@ -26,9 +26,7 @@ int chvt_main(int argc, char **argv) fd = get_console_fd(); num = xatoul_range(argv[1], 1, 63); - if ((-1 == ioctl(fd, VT_ACTIVATE, num)) - || (-1 == ioctl(fd, VT_WAITACTIVE, num))) { - bb_perror_msg_and_die("ioctl"); - } + xioctl(fd, VT_ACTIVATE, (void *)num); + xioctl(fd, VT_WAITACTIVE, (void *)num); return EXIT_SUCCESS; } diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c index db52747ad..a69026664 100644 --- a/console-tools/deallocvt.c +++ b/console-tools/deallocvt.c @@ -31,8 +31,6 @@ int deallocvt_main(int argc, char **argv) bb_show_usage(); } - if (-1 == ioctl(get_console_fd(), VT_DISALLOCATE, num)) { - bb_perror_msg_and_die("VT_DISALLOCATE"); - } + xioctl(get_console_fd(), VT_DISALLOCATE, (void *)num); return EXIT_SUCCESS; } diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c index f61795cf0..a606d568e 100644 --- a/console-tools/dumpkmap.c +++ b/console-tools/dumpkmap.c @@ -50,12 +50,12 @@ int dumpkmap_main(int argc, char **argv) for (j = 0; j < NR_KEYS; j++) { ke.kb_index = j; ke.kb_table = i; - if (ioctl(fd, KDGKBENT, &ke) < 0) { - bb_perror_msg("ioctl failed with %s, %s, %p", + if (!ioctl_or_perror(fd, KDGKBENT, &ke, + "ioctl failed with %s, %s, %p", (char *)&ke.kb_index, (char *)&ke.kb_table, - &ke.kb_value); - } else { + &ke.kb_value) + ) { write(1, (void*)&ke.kb_value, 2); } } diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c index b046d40e3..6b4dcb475 100644 --- a/console-tools/loadfont.c +++ b/console-tools/loadfont.c @@ -49,13 +49,11 @@ static void do_loadfont(int fd, unsigned char *inbuf, int unit, int fontsize) cfd.charheight = unit; cfd.chardata = buf; - if (ioctl(fd, PIO_FONTX, &cfd) == 0) + if (!ioctl_or_perror(fd, PIO_FONTX, &cfd, "PIO_FONTX ioctl failed (will try PIO_FONT)")) goto ret; /* success */ - bb_perror_msg("PIO_FONTX ioctl (will try PIO_FONT)"); } #endif - if (ioctl(fd, PIO_FONT, buf)) - bb_perror_msg_and_die("PIO_FONT ioctl"); + xioctl(fd, PIO_FONT, buf); ret: free(buf); } @@ -92,20 +90,10 @@ 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) { - bb_error_msg("it seems this kernel is older than 1.1.92"); - bb_error_msg_and_die("no Unicode mapping table loaded"); - } else -#endif - bb_perror_msg_and_die("PIO_UNIMAPCLR"); - } + xioctl(fd, PIO_UNIMAPCLR, &advice); ud.entry_ct = ct; ud.entries = up; - if (ioctl(fd, PIO_UNIMAP, &ud)) { - bb_perror_msg_and_die("PIO_UNIMAP"); - } + xioctl(fd, PIO_UNIMAP, &ud); } static void loadnewfont(int fd) diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c index f437415db..8745b3be2 100644 --- a/console-tools/setconsole.c +++ b/console-tools/setconsole.c @@ -42,8 +42,6 @@ int setconsole_main(int argc, char **argv) device = DEV_CONSOLE; } - if (-1 == ioctl(xopen(device, O_RDONLY), TIOCCONS)) { - bb_perror_msg_and_die("TIOCCONS"); - } + xioctl(xopen(device, O_RDONLY), TIOCCONS, NULL); return EXIT_SUCCESS; } diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c index 0911ede50..3de5f9856 100644 --- a/console-tools/setkeycodes.c +++ b/console-tools/setkeycodes.c @@ -39,9 +39,9 @@ int setkeycodes_main(int argc, char** argv) a.scancode -= 0xe000; a.scancode += 128; } - if (ioctl(fd, KDSETKEYCODE, &a)) { - bb_perror_msg_and_die("failed to set SCANCODE %x to KEYCODE %d", sc, a.keycode); - } + ioctl_or_perror_and_die(fd, KDSETKEYCODE, &a, + "failed to set SCANCODE %x to KEYCODE %d", + sc, a.keycode); argc -= 2; argv += 2; } diff --git a/console-tools/setlogcons.c b/console-tools/setlogcons.c index f95a65390..2e2a5a471 100644 --- a/console-tools/setlogcons.c +++ b/console-tools/setlogcons.c @@ -25,8 +25,7 @@ int setlogcons_main(int argc, char **argv) if (argc == 2) arg.subarg = xatoul_range(argv[1], 0, 63); - if (ioctl(xopen(VC_1, O_RDONLY), TIOCLINUX, &arg)) - bb_perror_msg_and_die("TIOCLINUX"); + xioctl(xopen(VC_1, O_RDONLY), TIOCLINUX, &arg); return 0; } |