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 /libbb | |
| 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 'libbb')
| -rw-r--r-- | libbb/Config.in | 7 | ||||
| -rw-r--r-- | libbb/xfuncs.c | 58 |
2 files changed, 65 insertions, 0 deletions
diff --git a/libbb/Config.in b/libbb/Config.in index f82a2b1..5055015 100644 --- a/libbb/Config.in +++ b/libbb/Config.in @@ -120,4 +120,11 @@ config MONOTONIC_SYSCALL will be used instead (which gives wrong results if date/time is reset). +config IOCTL_HEX2STR_ERROR + bool "Use ioctl names rather than hex values in error messages" + default y + help + Use ioctl names rather than hex values in error messages + (e.g. VT_DISALLOCATE rather than 0x5608). If disabled this + saves about 1400 bytes. endmenu diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index d02ef9c..fad111a 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -639,3 +639,61 @@ int get_terminal_width_height(const int fd, int *width, int *height) return ret; } + +void ioctl_or_perror_and_die(int fd, int request, void *argp, const char *fmt,...) +{ + va_list p; + + if (ioctl(fd, request, argp) < 0) { + va_start(p, fmt); + bb_vperror_msg(fmt, p); + /* xfunc_die can actually longjmp, so be nice */ + va_end(p); + xfunc_die(); + } +} + +int ioctl_or_perror(int fd, int request, void *argp, const char *fmt,...) +{ + va_list p; + int ret = ioctl(fd, request, argp); + + if (ret < 0) { + va_start(p, fmt); + bb_vperror_msg(fmt, p); + va_end(p); + } + return ret; +} + +#if ENABLE_IOCTL_HEX2STR_ERROR +int bb_ioctl_or_warn(int fd, int request, void *argp, const char *ioctl_name) +{ + int ret; + + ret = ioctl(fd, request, argp); + if (ret < 0) + bb_perror_msg("%s", ioctl_name); + return ret; +} +void bb_xioctl(int fd, int request, void *argp, const char *ioctl_name) +{ + if (ioctl(fd, request, argp) < 0) + bb_perror_msg_and_die("%s", ioctl_name); +} +#else +int bb_ioctl_or_warn(int fd, int request, void *argp) +{ + int ret; + + ret = ioctl(fd, request, argp); + if (ret < 0) + bb_perror_msg("ioctl %#x failed", request); + return ret; +} +void bb_xioctl(int fd, int request, void *argp) +{ + if (ioctl(fd, request, argp) < 0) + bb_perror_msg_and_die("ioctl %#x failed", request); +} +#endif |