aboutsummaryrefslogtreecommitdiff
path: root/src/comp.c
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2019-06-12 11:08:22 +0300
committerSergey Poznyakoff <gray@gnu.org>2019-06-12 11:15:51 +0300
commitf5c72b5e74ea7aaf1375f763f977e3249c6b7fc4 (patch)
tree22efbd43e8215666e7d7391193e4030d4354342e /src/comp.c
parent07e7ee3d732b60e0b7f5b242bbfb0cdec8e99e7f (diff)
downloadpies-f5c72b5e74ea7aaf1375f763f977e3249c6b7fc4.tar.gz
pies-f5c72b5e74ea7aaf1375f763f977e3249c6b7fc4.tar.bz2
Check accept components and inet built-in services.
* src/comp.c (component_verify,component_finish): Fix check for the presense of the "command" statement. * src/pies.c (component_keywords): Reorder some entries for the consistency of config-help output. * tests/.gitignore: Add new files. * tests/Makefile.am: Add new tests and noinst programs. * tests/accept.at: New test. * tests/builtin.at: New test. * tests/chargen.c: New file. * tests/readtime.c: New file. * tests/recvfd.c: Rewrite for testing both accept and pass-fd components. * tests/passfd.at: Pass -s option to recvfd * tests/testsuite.at: Add new tests. * tests/lines.c: Minor changes. * tests/nt.c: Minor changes. * tests/to.c: Minor changes.
Diffstat (limited to 'src/comp.c')
-rw-r--r--src/comp.c20
1 files changed, 5 insertions, 15 deletions
diff --git a/src/comp.c b/src/comp.c
index 7056855..6eeeeed 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -595,9 +595,8 @@ component_verify (struct component *comp, grecs_locus_t *locus)
"%s", _("\"internal\" used with \"command\""));
}
}
- else if (!comp->argv)
- COMPERR (grecs_error,
- "%s", _("missing command line"));
+ else if (!comp->command)
+ COMPERR (grecs_error, "%s", _("no 'command' statement"));
if (ISCF_TCPMUX (comp->flags))
{
@@ -736,9 +735,8 @@ component_verify (struct component *comp, grecs_locus_t *locus)
void
component_finish (struct component *comp, grecs_locus_t *locus)
{
- if (!comp->command)
+ if (component_verify (comp, locus))
{
- grecs_error (locus, 0, "%s", _("no 'command' statement"));
component_free (comp);
return;
}
@@ -752,7 +750,7 @@ component_finish (struct component *comp, grecs_locus_t *locus)
comp->argv[2] = grecs_strdup (comp->command);
comp->argv[3] = NULL;
}
- else
+ else if (comp->command)
{
struct wordsplit ws;
if (wordsplit (comp->command, &ws, WRDSF_DEFFLAGS))
@@ -773,14 +771,7 @@ component_finish (struct component *comp, grecs_locus_t *locus)
if (comp->privs.groups)
comp->privs.groups->cmp = list_str_cmp;
- if (component_verify (comp, locus))
- {
- component_free (comp);
- }
- else
- {
- size_t n = grecs_list_size (comp->prereq);
- if (n == 1)
+ if (grecs_list_size (comp->prereq) == 1)
{
const char *item = grecs_list_index (comp->prereq, 0);
if (strcmp (item, "all") == 0)
@@ -798,7 +789,6 @@ component_finish (struct component *comp, grecs_locus_t *locus)
}
}
}
-}
struct component *
component_get (size_t n)

Return to:

Send suggestions and report system problems to the System administrator.