diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-14 22:07:14 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-14 22:07:14 +0000 |
| commit | fb79a2e2cfe33002398f1898c26d8e4f341db006 (patch) | |
| tree | f5b3ee27db5bc8c9b181fbec171f8fa430a75ba5 /networking/slattach.c | |
| parent | fcfaf2e18aba06dd90b16958ecfbfcfbf59ceb02 (diff) | |
| download | busybox-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 'networking/slattach.c')
| -rw-r--r-- | networking/slattach.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/networking/slattach.c b/networking/slattach.c index 3495df598..1a4423b72 100644 --- a/networking/slattach.c +++ b/networking/slattach.c | |||
| @@ -50,8 +50,7 @@ static void save_state(void) | |||
| 50 | bb_perror_msg_and_die("get state"); | 50 | bb_perror_msg_and_die("get state"); |
| 51 | 51 | ||
| 52 | /* Save line discipline */ | 52 | /* Save line discipline */ |
| 53 | if (ioctl(handle, TIOCGETD, &saved_disc) < 0) | 53 | xioctl(handle, TIOCGETD, &saved_disc); |
| 54 | bb_perror_msg_and_die("get discipline"); | ||
| 55 | } | 54 | } |
| 56 | 55 | ||
| 57 | static int set_termios_state_and_warn(struct termios *state) | 56 | static int set_termios_state_and_warn(struct termios *state) |
| @@ -81,8 +80,7 @@ static void restore_state_and_exit(int exitcode) | |||
| 81 | struct termios state; | 80 | struct termios state; |
| 82 | 81 | ||
| 83 | /* Restore line discipline */ | 82 | /* Restore line discipline */ |
| 84 | if (ioctl(handle, TIOCSETD, &saved_disc) < 0) { | 83 | if (ioctl_or_warn(handle, TIOCSETD, &saved_disc) < 0) { |
| 85 | bb_perror_msg("set discipline"); | ||
| 86 | exitcode = 1; | 84 | exitcode = 1; |
| 87 | } | 85 | } |
| 88 | 86 | ||
| @@ -115,14 +113,12 @@ static void set_state(struct termios *state, int encap) | |||
| 115 | goto bad; | 113 | goto bad; |
| 116 | /* Set line discliple (N_SLIP always) */ | 114 | /* Set line discliple (N_SLIP always) */ |
| 117 | disc = N_SLIP; | 115 | disc = N_SLIP; |
| 118 | if (ioctl(handle, TIOCSETD, &disc) < 0) { | 116 | if (ioctl_or_warn(handle, TIOCSETD, &disc) < 0) { |
| 119 | bb_perror_msg("set discipline"); | ||
| 120 | goto bad; | 117 | goto bad; |
| 121 | } | 118 | } |
| 122 | 119 | ||
| 123 | /* Set encapsulation (SLIP, CSLIP, etc) */ | 120 | /* Set encapsulation (SLIP, CSLIP, etc) */ |
| 124 | if (ioctl(handle, SIOCSIFENCAP, &encap) < 0) { | 121 | if (ioctl_or_warn(handle, SIOCSIFENCAP, &encap) < 0) { |
| 125 | bb_perror_msg("set encapsulation"); | ||
| 126 | bad: | 122 | bad: |
| 127 | restore_state_and_exit(1); | 123 | restore_state_and_exit(1); |
| 128 | } | 124 | } |