emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flock: merge spawn_and_wait() code patchs for -c and sans-c uses

Browse Source 
function                                             old     new   delta
flock_main                                           334     319     -15

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-04-24 18:21:32 +02:00
parent e1d426fd65
commit 2fbc3123a2
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
util-linux/flock.c
View File

@ -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;