From 21e8e8da6483c80a6054b06e48341968a7dccdd5 Mon Sep 17 00:00:00 2001 From: Pascal Bellard Date: Sun, 4 Jul 2010 00:57:03 +0200 Subject: libbb: introduce and use BB_EXECVP_or_die() function old new delta BB_EXECVP_or_die - 47 +47 time_main 1042 1043 +1 chrt_main 371 364 -7 ionice_main 292 282 -10 setsid_main 69 56 -13 nohup_main 236 223 -13 cttyhack_main 266 253 -13 chroot_main 94 81 -13 chpst_main 746 733 -13 timeout_main 297 279 -18 taskset_main 541 522 -19 vfork_child 67 45 -22 parse 975 953 -22 lpd_main 770 748 -22 launch_helper 192 170 -22 tcpudpsvd_main 1810 1782 -28 nice_main 190 156 -34 env_main 242 206 -36 run_command 221 174 -47 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 1/17 up/down: 48/-352) Total: -304 bytes Signed-off-by: Pascal Bellard Signed-off-by: Denys Vlasenko --- networking/ifupdown.c | 3 +-- networking/tcpudp.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'networking') diff --git a/networking/ifupdown.c b/networking/ifupdown.c index 714d2a107..1bab2c5cb 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c @@ -1052,8 +1052,7 @@ static int popen2(FILE **in, FILE **out, char *command, char *param) close(outfd.rd); xmove_fd(infd.rd, 0); xmove_fd(outfd.wr, 1); - BB_EXECVP(command, argv); - bb_perror_msg_and_die("can't execute '%s'", command); + BB_EXECVP_or_die(argv); } /* parent */ close(infd.rd); diff --git a/networking/tcpudp.c b/networking/tcpudp.c index 4e4756738..53e622b56 100644 --- a/networking/tcpudp.c +++ b/networking/tcpudp.c @@ -501,10 +501,10 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv) #ifdef SSLSVD strcpy(id, utoa(pid)); ssl_io(0, argv); + bb_perror_msg_and_die("can't execute '%s'", argv[0]); #else - BB_EXECVP(argv[0], argv); + BB_EXECVP_or_die(argv); #endif - bb_perror_msg_and_die("can't execute '%s'", argv[0]); } /* -- cgit v1.2.3