ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

flocks: keep run_program() simple

This commit is contained in:
Karel Zak 2016-10-31 13:15:35 +01:00
parent 4a53290774
commit 93fea49f28
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys-utils/flock.c
View File

@ -115,11 +115,8 @@ static int open_file(const char *filename, int *flags)
return fd;
}
static void __attribute__((__noreturn__)) run_program(int fd, char **cmd_argv, int do_close)
static void __attribute__((__noreturn__)) run_program(char **cmd_argv)
{
if (do_close)
close(fd);
execvp(cmd_argv[0], cmd_argv);
warn(_("failed to execute %s"), cmd_argv[0]);
@ -348,11 +345,13 @@ int main(int argc, char *argv[])
err(EX_OSERR, _("fork failed"));
/* child */
else if (f == 0)
run_program(fd, cmd_argv, do_close);
else if (f == 0) {
if (do_close)
close(fd);
run_program(cmd_argv);
/* parent */
else {
} else {
do {
w = waitpid(f, &status, 0);
if (w == -1 && errno != EINTR)
@ -373,7 +372,7 @@ int main(int argc, char *argv[])
} else
/* no-fork execution */
run_program(fd, cmd_argv, do_close);
run_program(cmd_argv);
}
return status;