Use bb_xopen
This commit is contained in:
parent
236e93d133
commit
02e0355504
@ -51,11 +51,7 @@ int dumpkmap_main(int argc, char **argv)
|
|||||||
bb_show_usage();
|
bb_show_usage();
|
||||||
}
|
}
|
||||||
|
|
||||||
fd = open(CURRENT_VC, O_RDWR);
|
fd=bb_xopen(CURRENT_VC, O_RDWR);
|
||||||
if (fd < 0) {
|
|
||||||
bb_perror_msg("Error opening " CURRENT_VC);
|
|
||||||
return EXIT_FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
write(1, magic, 7);
|
write(1, magic, 7);
|
||||||
|
|
||||||
|
@ -37,10 +37,7 @@ int loadacm_main(int argc, char **argv)
|
|||||||
bb_show_usage();
|
bb_show_usage();
|
||||||
}
|
}
|
||||||
|
|
||||||
fd = open(CURRENT_VC, O_RDWR);
|
fd = bb_xopen(CURRENT_VC, O_RDWR);
|
||||||
if (fd < 0) {
|
|
||||||
bb_perror_msg_and_die("Error opening " CURRENT_VC);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (screen_map_load(fd, stdin)) {
|
if (screen_map_load(fd, stdin)) {
|
||||||
bb_perror_msg_and_die("Error loading acm");
|
bb_perror_msg_and_die("Error loading acm");
|
||||||
|
@ -46,9 +46,7 @@ extern int loadfont_main(int argc, char **argv)
|
|||||||
if (argc != 1)
|
if (argc != 1)
|
||||||
bb_show_usage();
|
bb_show_usage();
|
||||||
|
|
||||||
fd = open(CURRENT_VC, O_RDWR);
|
fd = bb_xopen(CURRENT_VC, O_RDWR);
|
||||||
if (fd < 0)
|
|
||||||
bb_perror_msg_and_die("Error opening " CURRENT_VC);
|
|
||||||
loadnewfont(fd);
|
loadnewfont(fd);
|
||||||
|
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
|
@ -48,11 +48,8 @@ int openvt_main(int argc, char **argv)
|
|||||||
if (!isdigit(argv[1][0]))
|
if (!isdigit(argv[1][0]))
|
||||||
bb_show_usage();
|
bb_show_usage();
|
||||||
|
|
||||||
vtno = (int) atol(argv[1]);
|
/* check for Illegal vt number */
|
||||||
|
vtno=bb_xgetlarg(argv[1], 10, 1, 12);
|
||||||
/* if (vtno <= 0 || vtno > 63) */
|
|
||||||
if (vtno <= 0 || vtno > 12)
|
|
||||||
bb_error_msg_and_die("Illegal vt number (%d)", vtno);
|
|
||||||
|
|
||||||
sprintf(vtname, VTNAME, vtno);
|
sprintf(vtname, VTNAME, vtno);
|
||||||
|
|
||||||
@ -73,8 +70,7 @@ int openvt_main(int argc, char **argv)
|
|||||||
close(0); /* so that new vt becomes stdin */
|
close(0); /* so that new vt becomes stdin */
|
||||||
|
|
||||||
/* and grab new one */
|
/* and grab new one */
|
||||||
if ((fd = open(vtname, O_RDWR)) == -1)
|
fd = bb_xopen(vtname, O_RDWR);
|
||||||
bb_perror_msg_and_die("could not open %s", vtname);
|
|
||||||
|
|
||||||
/* Reassign stdout and sterr */
|
/* Reassign stdout and sterr */
|
||||||
close(1);
|
close(1);
|
||||||
|
Loading…
Reference in New Issue
Block a user