topjohnwu/ndk-busybox
1
0
Fork 0
mirror of https://github.com/topjohnwu/ndk-busybox.git synced 2024-11-24 20:29:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use bb_xopen

Browse Source
This commit is contained in:
Glenn L McGrath 2003-12-20 06:00:08 +00:00
parent 236e93d133
commit 02e0355504
4 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
console-tools/dumpkmap.c
View File

@ -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);

5
console-tools/loadacm.c
View File

@ -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");

4
console-tools/loadfont.c
View File

@ -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;

10
console-tools/openvt.c
View File

@ -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);