From fb79a2e2cfe33002398f1898c26d8e4f341db006 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sat, 14 Jul 2007 22:07:14 +0000 Subject: xioctl and friends by Tito 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 --- miscutils/devfsd.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'miscutils/devfsd.c') diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index 814fbd686..1dfbadf83 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c @@ -234,7 +234,6 @@ static char get_old_ide_name(unsigned , unsigned); static char *write_old_sd_name(char *, unsigned, unsigned, const char *); /* busybox functions */ -static void do_ioctl_or_die(int fd, int request, unsigned long event_mask_flag); static int get_uid_gid(int flag, const char *string); static void safe_memcpy(char * dest, const char * src, int len); static unsigned int scan_dev_name_common(const char *d, unsigned int n, int addendum, const char *ptr); @@ -298,12 +297,6 @@ static const char * const bb_msg_variable_not_found = "variable: %s not found"; #define error_logger_and_die(p, fmt, args...) exit(1) #endif -static void do_ioctl_or_die(int fd, int request, unsigned long event_mask_flag) -{ - if (ioctl(fd, request, event_mask_flag) == -1) - msg_logger_and_die(LOG_ERR, "ioctl"); -} - static void safe_memcpy(char *dest, const char *src, int len) { memcpy(dest , src, len); @@ -386,8 +379,7 @@ int devfsd_main(int argc, char **argv) if (fcntl(fd, F_SETFD, FD_CLOEXEC) != 0) bb_perror_msg_and_die("FD_CLOEXEC"); - if (ioctl(fd, DEVFSDIOC_GET_PROTO_REV, &proto_rev) == -1) - bb_perror_msg_and_die("ioctl"); + xioctl(fd, DEVFSDIOC_GET_PROTO_REV, &proto_rev); /*setup initial entries */ for (curr = initial_symlinks; curr->dest != NULL; ++curr) @@ -404,7 +396,7 @@ int devfsd_main(int argc, char **argv) exit(EXIT_SUCCESS); /* -v */ } /* Tell kernel we are special(i.e. we get to see hidden entries) */ - do_ioctl_or_die(fd, DEVFSDIOC_SET_EVENT_MASK, 0); + xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, 0); sigemptyset(&new_action.sa_mask); new_action.sa_flags = 0; @@ -435,7 +427,7 @@ int devfsd_main(int argc, char **argv) if (do_daemon) { /* Release so that the child can grab it */ - do_ioctl_or_die(fd, DEVFSDIOC_RELEASE_EVENT_QUEUE, 0); + xioctl(fd, DEVFSDIOC_RELEASE_EVENT_QUEUE, 0); bb_daemonize_or_rexec(0, argv); } else if (ENABLE_DEVFSD_FG_NP) { setpgid(0, 0); /* Become process group leader */ @@ -661,7 +653,7 @@ static int do_servicing(int fd, unsigned long event_mask) /* Tell devfs what events we care about */ tmp_event_mask = event_mask; - do_ioctl_or_die(fd, DEVFSDIOC_SET_EVENT_MASK, tmp_event_mask); + xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, tmp_event_mask); while (!caught_signal) { errno = 0; bytes = read(fd,(char *) &info, sizeof info); -- cgit v1.2.3