aboutsummaryrefslogtreecommitdiff
path: root/console-tools
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-07-14 22:07:14 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-07-14 22:07:14 +0000
commitfb79a2e2cfe33002398f1898c26d8e4f341db006 (patch)
treef5b3ee27db5bc8c9b181fbec171f8fa430a75ba5 /console-tools
parentfcfaf2e18aba06dd90b16958ecfbfcfbf59ceb02 (diff)
downloadbusybox-w32-fb79a2e2cfe33002398f1898c26d8e4f341db006.tar.gz
busybox-w32-fb79a2e2cfe33002398f1898c26d8e4f341db006.tar.bz2
busybox-w32-fb79a2e2cfe33002398f1898c26d8e4f341db006.zip
xioctl and friends by Tito <farmatito@tiscali.it>
function old new delta do_iptunnel 203 977 +774 process_dev 5328 5494 +166 ioctl_or_perror - 54 +54 ioctl_or_perror_and_die - 51 +51 ioctl_alt_func - 49 +49 bb_ioctl_or_warn - 47 +47 do_add_ioctl 102 145 +43 bb_xioctl - 39 +39 print_value_on_off - 31 +31 get_lcm 105 123 +18 arp_main 2155 2167 +12 .................. zcip_main 1576 1566 -10 setlogcons_main 92 82 -10 dumpkmap_main 263 253 -10 do_get_ioctl 85 75 -10 setkeycodes_main 165 154 -11 write_table 244 232 -12 vconfig_main 318 306 -12 do_del_ioctl 93 81 -12 set_address 75 62 -13 maybe_set_utc 30 16 -14 loadfont_main 495 479 -16 slattach_main 712 695 -17 do_loadfont 191 174 -17 do_iplink 1155 1136 -19 getty_main 2583 2562 -21 fbset_main 2058 2035 -23 do_time 588 565 -23 xioctl 25 - -25 read_rtc 186 160 -26 parse_conf 1299 1270 -29 udhcp_read_interface 269 239 -30 bb_ioctl 45 - -45 bb_ioctl_alt 70 - -70 bb_ioctl_on_off 78 - -78 .rodata 129370 129018 -352 do_show 799 - -799 ------------------------------------------------------------------------------ (add/remove: 6/5 grow/shrink: 13/49 up/down: 1316/-1864) Total: -548 bytes text data bss dec hex filename 675352 2740 13968 692060 a8f5c busybox_old 674804 2740 13968 691512 a8d38 busybox_unstripped
Diffstat (limited to 'console-tools')
-rw-r--r--console-tools/chvt.c6
-rw-r--r--console-tools/deallocvt.c4
-rw-r--r--console-tools/dumpkmap.c8
-rw-r--r--console-tools/loadfont.c20
-rw-r--r--console-tools/setconsole.c4
-rw-r--r--console-tools/setkeycodes.c6
-rw-r--r--console-tools/setlogcons.c3
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)
26 26
27 fd = get_console_fd(); 27 fd = get_console_fd();
28 num = xatoul_range(argv[1], 1, 63); 28 num = xatoul_range(argv[1], 1, 63);
29 if ((-1 == ioctl(fd, VT_ACTIVATE, num)) 29 xioctl(fd, VT_ACTIVATE, (void *)num);
30 || (-1 == ioctl(fd, VT_WAITACTIVE, num))) { 30 xioctl(fd, VT_WAITACTIVE, (void *)num);
31 bb_perror_msg_and_die("ioctl");
32 }
33 return EXIT_SUCCESS; 31 return EXIT_SUCCESS;
34} 32}
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)
31 bb_show_usage(); 31 bb_show_usage();
32 } 32 }
33 33
34 if (-1 == ioctl(get_console_fd(), VT_DISALLOCATE, num)) { 34 xioctl(get_console_fd(), VT_DISALLOCATE, (void *)num);
35 bb_perror_msg_and_die("VT_DISALLOCATE");
36 }
37 return EXIT_SUCCESS; 35 return EXIT_SUCCESS;
38} 36}
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)
50 for (j = 0; j < NR_KEYS; j++) { 50 for (j = 0; j < NR_KEYS; j++) {
51 ke.kb_index = j; 51 ke.kb_index = j;
52 ke.kb_table = i; 52 ke.kb_table = i;
53 if (ioctl(fd, KDGKBENT, &ke) < 0) { 53 if (!ioctl_or_perror(fd, KDGKBENT, &ke,
54 bb_perror_msg("ioctl failed with %s, %s, %p", 54 "ioctl failed with %s, %s, %p",
55 (char *)&ke.kb_index, 55 (char *)&ke.kb_index,
56 (char *)&ke.kb_table, 56 (char *)&ke.kb_table,
57 &ke.kb_value); 57 &ke.kb_value)
58 } else { 58 ) {
59 write(1, (void*)&ke.kb_value, 2); 59 write(1, (void*)&ke.kb_value, 2);
60 } 60 }
61 } 61 }
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)
49 cfd.charheight = unit; 49 cfd.charheight = unit;
50 cfd.chardata = buf; 50 cfd.chardata = buf;
51 51
52 if (ioctl(fd, PIO_FONTX, &cfd) == 0) 52 if (!ioctl_or_perror(fd, PIO_FONTX, &cfd, "PIO_FONTX ioctl failed (will try PIO_FONT)"))
53 goto ret; /* success */ 53 goto ret; /* success */
54 bb_perror_msg("PIO_FONTX ioctl (will try PIO_FONT)");
55 } 54 }
56#endif 55#endif
57 if (ioctl(fd, PIO_FONT, buf)) 56 xioctl(fd, PIO_FONT, buf);
58 bb_perror_msg_and_die("PIO_FONT ioctl");
59 ret: 57 ret:
60 free(buf); 58 free(buf);
61} 59}
@@ -92,20 +90,10 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
92 advice.advised_hashsize = 0; 90 advice.advised_hashsize = 0;
93 advice.advised_hashstep = 0; 91 advice.advised_hashstep = 0;
94 advice.advised_hashlevel = 0; 92 advice.advised_hashlevel = 0;
95 if (ioctl(fd, PIO_UNIMAPCLR, &advice)) { 93 xioctl(fd, PIO_UNIMAPCLR, &advice);
96#ifdef ENOIOCTLCMD
97 if (errno == ENOIOCTLCMD) {
98 bb_error_msg("it seems this kernel is older than 1.1.92");
99 bb_error_msg_and_die("no Unicode mapping table loaded");
100 } else
101#endif
102 bb_perror_msg_and_die("PIO_UNIMAPCLR");
103 }
104 ud.entry_ct = ct; 94 ud.entry_ct = ct;
105 ud.entries = up; 95 ud.entries = up;
106 if (ioctl(fd, PIO_UNIMAP, &ud)) { 96 xioctl(fd, PIO_UNIMAP, &ud);
107 bb_perror_msg_and_die("PIO_UNIMAP");
108 }
109} 97}
110 98
111static void loadnewfont(int fd) 99static 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)
42 device = DEV_CONSOLE; 42 device = DEV_CONSOLE;
43 } 43 }
44 44
45 if (-1 == ioctl(xopen(device, O_RDONLY), TIOCCONS)) { 45 xioctl(xopen(device, O_RDONLY), TIOCCONS, NULL);
46 bb_perror_msg_and_die("TIOCCONS");
47 }
48 return EXIT_SUCCESS; 46 return EXIT_SUCCESS;
49} 47}
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)
39 a.scancode -= 0xe000; 39 a.scancode -= 0xe000;
40 a.scancode += 128; 40 a.scancode += 128;
41 } 41 }
42 if (ioctl(fd, KDSETKEYCODE, &a)) { 42 ioctl_or_perror_and_die(fd, KDSETKEYCODE, &a,
43 bb_perror_msg_and_die("failed to set SCANCODE %x to KEYCODE %d", sc, a.keycode); 43 "failed to set SCANCODE %x to KEYCODE %d",
44 } 44 sc, a.keycode);
45 argc -= 2; 45 argc -= 2;
46 argv += 2; 46 argv += 2;
47 } 47 }
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)
25 if (argc == 2) 25 if (argc == 2)
26 arg.subarg = xatoul_range(argv[1], 0, 63); 26 arg.subarg = xatoul_range(argv[1], 0, 63);
27 27
28 if (ioctl(xopen(VC_1, O_RDONLY), TIOCLINUX, &arg)) 28 xioctl(xopen(VC_1, O_RDONLY), TIOCLINUX, &arg);
29 bb_perror_msg_and_die("TIOCLINUX");
30 29
31 return 0; 30 return 0;
32} 31}
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-13 05:00:28 +0000