From 2fbc3123a2d94a85317b2269c724939db7e18fbf Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 24 Apr 2016 18:21:32 +0200 Subject: flock: merge spawn_and_wait() code patchs for -c and sans-c uses function old new delta flock_main 334 319 -15 Signed-off-by: Denys Vlasenko --- util-linux/flock.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/util-linux/flock.c b/util-linux/flock.c index 539a835b7..1f7ade7c4 100644 --- a/util-linux/flock.c +++ b/util-linux/flock.c @@ -93,19 +93,19 @@ int flock_main(int argc UNUSED_PARAM, char **argv) } if (argv[0]) { - if (!(opt & OPT_c)) { - int rc = spawn_and_wait(argv); - if (rc < 0) - bb_simple_perror_msg(argv[0]); - return rc; + int rc; + if (opt & OPT_c) { + /* -c 'PROG ARGS' means "run sh -c 'PROG ARGS'" */ + argv -= 2; + argv[0] = (char*)get_shell_name(); + argv[1] = (char*)"-c"; + /* argv[2] = "PROG ARGS"; */ + /* argv[3] = NULL; */ } - /* -c 'PROG ARGS' means "run sh -c 'PROG ARGS'" */ - argv -= 2; - argv[0] = (char*)get_shell_name(); - argv[1] = (char*)"-c"; - /* argv[2] = "PROG ARGS"; */ - /* argv[3] = NULL; */ - return spawn_and_wait(argv); + rc = spawn_and_wait(argv); + if (rc < 0) + bb_simple_perror_msg(argv[0]); + return rc; } return EXIT_SUCCESS; -- cgit v1.2.3