aboutsummaryrefslogtreecommitdiff
path: root/src/pies.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pies.c')
-rw-r--r--src/pies.c48
1 files changed, 7 insertions, 41 deletions
diff --git a/src/pies.c b/src/pies.c
index 98488a6..6105ae6 100644
--- a/src/pies.c
+++ b/src/pies.c
@@ -524,37 +524,6 @@ config_array_to_argv (grecs_value_t *val, grecs_locus_t *locus, size_t *pargc)
}
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,
void *varptr, grecs_value_t *value, void *cb_data)
@@ -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."),

Return to:

Send suggestions and report system problems to the System administrator.