02e035550
Glenn L McGrath
2003-12-20
Subject
Use bb_xopen
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
console-tools/dumpkmap.c +1 -5console-tools/loadacm.c +1 -4console-tools/loadfont.c +1 -3console-tools/openvt.c +3 -7
console-tools/dumpkmap.c+1 -5
| @@ -51,11 +51,7 @@ int dumpkmap_main(int argc, char **argv) | |
| bb_show_usage(); | |
| } | |
| - | fd = open(CURRENT_VC, O_RDWR); |
| - | if (fd < 0) { |
| - | bb_perror_msg("Error opening " CURRENT_VC); |
| - | return EXIT_FAILURE; |
| - | } |
| + | fd=bb_xopen(CURRENT_VC, O_RDWR); |
| write(1, magic, 7); | |
console-tools/loadacm.c+1 -4
| @@ -37,10 +37,7 @@ int loadacm_main(int argc, char **argv) | |
| bb_show_usage(); | |
| } | |
| - | fd = open(CURRENT_VC, O_RDWR); |
| - | if (fd < 0) { |
| - | bb_perror_msg_and_die("Error opening " CURRENT_VC); |
| - | } |
| + | fd = bb_xopen(CURRENT_VC, O_RDWR); |
| if (screen_map_load(fd, stdin)) { | |
| bb_perror_msg_and_die("Error loading acm"); | |
console-tools/loadfont.c+1 -3
| @@ -46,9 +46,7 @@ extern int loadfont_main(int argc, char **argv) | |
| if (argc != 1) | |
| bb_show_usage(); | |
| - | fd = open(CURRENT_VC, O_RDWR); |
| - | if (fd < 0) |
| - | bb_perror_msg_and_die("Error opening " CURRENT_VC); |
| + | fd = bb_xopen(CURRENT_VC, O_RDWR); |
| loadnewfont(fd); | |
| return EXIT_SUCCESS; | |
console-tools/openvt.c+3 -7
| @@ -48,11 +48,8 @@ int openvt_main(int argc, char **argv) | |
| if (!isdigit(argv[1][0])) | |
| bb_show_usage(); | |
| - | vtno = (int) atol(argv[1]); |
| - | |
| - | /* if (vtno <= 0 || vtno > 63) */ |
| - | if (vtno <= 0 || vtno > 12) |
| - | bb_error_msg_and_die("Illegal vt number (%d)", vtno); |
| + | /* check for Illegal vt number */ |
| + | vtno=bb_xgetlarg(argv[1], 10, 1, 12); |
| sprintf(vtname, VTNAME, vtno); | |
| @@ -73,8 +70,7 @@ int openvt_main(int argc, char **argv) | |
| close(0); /* so that new vt becomes stdin */ | |
| /* and grab new one */ | |
| - | if ((fd = open(vtname, O_RDWR)) == -1) |
| - | bb_perror_msg_and_die("could not open %s", vtname); |
| + | fd = bb_xopen(vtname, O_RDWR); |
| /* Reassign stdout and sterr */ | |
| close(1); | |