path: root/src/pies.h
diff options
authorSergey Poznyakoff <gray@gnu.org>2019-05-31 08:45:23 +0300
committerSergey Poznyakoff <gray@gnu.org>2019-05-31 08:58:54 +0300
commit058f256a6f41fc9c36404b2e22580546e4f55b33 (patch)
treeb6afde4271da1d92e5c10e1c50213c2fda7b2831 /src/pies.h
parentca38eef07ac3f9a4825f0046c1d373ed7b2f074b (diff)
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/pies.h')
1 files changed, 3 insertions, 2 deletions
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 */
@@ -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 */

Return to:

Send suggestions and report system problems to the System administrator.