diff options
| author | Denis Vlasenko | 2007-07-14 22:07:14 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-07-14 22:07:14 +0000 |
| commit | fb79a2e2cfe33002398f1898c26d8e4f341db006 (patch) | |
| tree | f5b3ee27db5bc8c9b181fbec171f8fa430a75ba5 /loginutils | |
| parent | fcfaf2e18aba06dd90b16958ecfbfcfbf59ceb02 (diff) | |
| download | busybox-fb79a2e2cfe33002398f1898c26d8e4f341db006.zip busybox-fb79a2e2cfe33002398f1898c26d8e4f341db006.tar.gz | |
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 'loginutils')
| -rw-r--r-- | loginutils/getty.c | 6 | ||||
| -rw-r--r-- | loginutils/vlock.c | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/loginutils/getty.c b/loginutils/getty.c index f969124..2fcb0d9 100644 --- a/loginutils/getty.c +++ b/loginutils/getty.c @@ -281,8 +281,7 @@ static void open_tty(const char *tty, struct termios *tp, int local) * 5 seconds seems to be a good value. */ - if (ioctl(0, TCGETS, tp) < 0) - bb_perror_msg_and_die("%s: ioctl(TCGETS)", tty); + ioctl_or_perror_and_die(0, TCGETS, tp, "%s: TCGETS", tty); /* * It seems to be a terminal. Set proper protections and ownership. Mode @@ -647,8 +646,7 @@ static void termios_final(struct options *op, struct termios *tp, struct chardat /* Finally, make the new settings effective */ - if (ioctl(0, TCSETS, tp) < 0) - bb_perror_msg_and_die("%s: ioctl(TCSETS)", op->tty); + ioctl_or_perror_and_die(0, TCSETS, tp, "%s: TCSETS", op->tty); } diff --git a/loginutils/vlock.c b/loginutils/vlock.c index 7f614fc..665ebd8 100644 --- a/loginutils/vlock.c +++ b/loginutils/vlock.c @@ -62,9 +62,7 @@ int vlock_main(int argc, char **argv) vfd = xopen(CURRENT_TTY, O_RDWR); - if (ioctl(vfd, VT_GETMODE, &vtm) < 0) { - bb_perror_msg_and_die("VT_GETMODE"); - } + xioctl(vfd, VT_GETMODE, &vtm); /* mask a bunch of signals */ sigprocmask(SIG_SETMASK, NULL, &sig); |