diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2019-05-31 08:45:23 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2019-05-31 08:58:54 +0300 |
commit | 058f256a6f41fc9c36404b2e22580546e4f55b33 (patch) | |
tree | b6afde4271da1d92e5c10e1c50213c2fda7b2831 /src/comp.c | |
parent | ca38eef07ac3f9a4825f0046c1d373ed7b2f074b (diff) | |
download | pies-058f256a6f41fc9c36404b2e22580546e4f55b33.tar.gz pies-058f256a6f41fc9c36404b2e22580546e4f55b33.tar.bz2 |
Provide an option to run commands via sh -c
The new flag "shell" instructs pies to run the command marked with it
as '/bin/sh -c $command'. Alternative shell can be supplied ising the
'program' statement.
This is useful if the command line uses shell-specific features (command
or variable expansion, redirection, pipes, etc.)
This commit also fixes a bug in the 'env' statement handling: a single
argument with embedded whitespaces was undergoing word splitting and
thus incorrectly handled as multiple arguments.
* NEWS: Document changes.
* doc/pies.texi: Likewise.
* src/comp.c (component_free): Free command.
(component_finish): Split command into argv/argc as directed by the
CF_SHELL flag.
* src/pies.c (_cb_command): Remove. Functionality moved to
component_finish().
(_cb_env): Bugfix. Don't split arguments.
* src/pies.h (CF_SHELL): New flag.
(component) <command>: New member.
* tests/Makefile.am: Add new tests.
* tests/testsuite.at: Add new tests.
* tests/aux/respawn: Change default timeout to 1 second.
* tests/respawn.at: Minor change.
* tests/shell.at: New test.
Diffstat (limited to 'src/comp.c')
-rw-r--r-- | src/comp.c | 24 |
1 files changed, 24 insertions, 0 deletions
@@ -171,6 +171,7 @@ component_free (struct component *comp) component_unlink (comp); free (comp->tag); free (comp->program); + free (comp->command); if (comp->argv) { for (i = 0; i < comp->argc; i++) @@ -747,6 +748,29 @@ component_verify (struct component *comp, grecs_locus_t *locus) void component_finish (struct component *comp, grecs_locus_t *locus) { + if (comp->flags & CF_SHELL) + { + comp->argc = 3; + comp->argv = grecs_calloc (comp->argc + 1, sizeof (comp->argv[0])); + comp->argv[0] = grecs_strdup (comp->program ? comp->program : "/bin/sh"); + comp->argv[1] = grecs_strdup ("-c"); + comp->argv[2] = grecs_strdup (comp->command); + comp->argv[3] = NULL; + } + else + { + struct wordsplit ws; + if (wordsplit (comp->command, &ws, WRDSF_DEFFLAGS)) + { + grecs_error (locus, 0, "wordsplit: %s", + wordsplit_strerror (&ws)); + component_free (comp); + return; + } + wordsplit_get_words (&ws, &comp->argc, &comp->argv); + wordsplit_free (&ws); + } + if (comp->prereq) comp->prereq->cmp = list_str_cmp; if (comp->depend) |