From 65c34c52df3ed46f0b811d1858c271a373ab6af5 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 31 May 2019 23:39:22 +0200 Subject: dhcp: get rid of static data signal_pipe function old new delta udhcp_sp_setup 65 110 +45 udhcp_sp_fd_set 60 59 -1 udhcpd_main 1442 1437 -5 udhcpc_main 2684 2679 -5 signal_pipe 8 - -8 packed_usage 33292 33284 -8 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 1/4 up/down: 45/-27) Total: 18 bytes text data bss dec hex filename 952746 481 7296 960523 ea80b busybox_old 952768 481 7288 960537 ea819 busybox_unstripped Signed-off-by: Denys Vlasenko --- networking/udhcp/d6_dhcpc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'networking/udhcp/d6_dhcpc.c') diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c index 15e9f3924..02766ba16 100644 --- a/networking/udhcp/d6_dhcpc.c +++ b/networking/udhcp/d6_dhcpc.c @@ -1174,6 +1174,10 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv) client_data.script = CONFIG_UDHCPC_DEFAULT_SCRIPT; client_data.sockfd = -1; + /* Make sure fd 0,1,2 are open */ + /* Set up the signal pipe on fds 3,4 - must be before openlog() */ + udhcp_sp_setup(); + /* Parse command line */ opt = getopt32long(argv, "^" /* O,x: list; -T,-t,-A take numeric param */ @@ -1268,14 +1272,10 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv) logmode |= LOGMODE_SYSLOG; } - /* Make sure fd 0,1,2 are open */ - bb_sanitize_stdio(); /* Create pidfile */ write_pidfile(client_data.pidfile); /* Goes to stdout (unless NOMMU) and possibly syslog */ bb_info_msg("started, v"BB_VER); - /* Set up the signal pipe */ - udhcp_sp_setup(); client_data.state = INIT_SELECTING; d6_run_script_no_option("deconfig"); -- cgit v1.2.3