From 058f256a6f41fc9c36404b2e22580546e4f55b33 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Fri, 31 May 2019 08:45:23 +0300 Subject: 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) : 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. --- src/comp.c | 24 ++++++++++++++++++++++++ src/pies.c | 48 +++++++----------------------------------------- src/pies.h | 5 +++-- 3 files changed, 34 insertions(+), 43 deletions(-) (limited to 'src') diff --git a/src/comp.c b/src/comp.c index 25f2657..499dfe5 100644 --- a/src/comp.c +++ b/src/comp.c @@ -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) diff --git a/src/pies.c b/src/pies.c index 98488a6..6105ae6 100644 --- a/src/pies.c +++ b/src/pies.c @@ -523,37 +523,6 @@ config_array_to_argv (grecs_value_t *val, grecs_locus_t *locus, size_t *pargc) return argv; } -static int -_cb_command (enum grecs_callback_command cmd, - grecs_locus_t *locus, - void *varptr, grecs_value_t *value, void *cb_data) -{ - struct component *comp = varptr; - struct wordsplit ws; - - switch (value->type) - { - case GRECS_TYPE_STRING: - if (wordsplit (value->v.string, &ws, WRDSF_DEFFLAGS)) - { - grecs_error (locus, 0, "wordsplit: %s", strerror (errno)); - return 1; - } - wordsplit_get_words (&ws, &comp->argc, &comp->argv); - wordsplit_free (&ws); - break; - - case GRECS_TYPE_ARRAY: - comp->argv = config_array_to_argv (value, locus, &comp->argc); - break; - - case GRECS_TYPE_LIST: - grecs_error (locus, 0, _("unexpected list")); - return 1; - } - return 0; -} - static int _cb_umask (enum grecs_callback_command cmd, grecs_locus_t *locus, @@ -589,13 +558,9 @@ _cb_env (enum grecs_callback_command cmd, switch (value->type) { case GRECS_TYPE_STRING: - if (wordsplit (value->v.string, &ws, WRDSF_DEFFLAGS)) - { - grecs_error (locus, 0, "wordsplit: %s", strerror (errno)); - return 1; - } - wordsplit_get_words (&ws, &argc, &argv); - wordsplit_free (&ws); + argv = grecs_calloc (2, sizeof (argv[0])); + argv[0] = grecs_strdup (value->v.string); + argv[1] = NULL; break; case GRECS_TYPE_ARRAY: @@ -887,6 +852,7 @@ str_to_cf (const char *string, int *flags) { "resolve", CF_RESOLVE }, { "siggroup", CF_SIGGROUP }, { "nullinput", CF_NULLINPUT }, + { "shell", CF_SHELL }, { NULL } }; @@ -1014,9 +980,9 @@ struct grecs_keyword component_keywords[] = { NULL, N_("Command line."), grecs_type_string, GRECS_DFLT, - NULL, 0, - _cb_command, - }, + NULL, offsetof (struct component, command), + NULL, + }, {"prerequisites", N_("list"), N_("List of prerequisites."), diff --git a/src/pies.h b/src/pies.h index 74cb346..2e544e1 100644 --- a/src/pies.h +++ b/src/pies.h @@ -206,10 +206,10 @@ enum pies_comp_mode the environment */ #define CF_RESOLVE 0x080 /* Resolve IP addresses */ #define CF_SIGGROUP 0x100 /* Send signals to the process group */ - #define CF_NULLINPUT 0x200 /* Provide null input stream */ +#define CF_SHELL 0x400 /* Invoke via sh -c */ -#define CF_REMOVE 0x400 /* Marked for removal */ +#define CF_REMOVE 0xf000 /* Marked for removal */ #define ISCF_TCPMUX(f) ((f) & (CF_TCPMUX | CF_TCPMUXPLUS)) @@ -226,6 +226,7 @@ struct component enum pies_comp_mode mode; char *tag; /* Entry tag (for diagnostics purposes) */ char *program; /* Program name */ + char *command; /* Full command line */ size_t argc; /* Number of command line arguments */ char **argv; /* Program command line */ char **env; /* Program environment */ -- cgit v1.2.1