diff options
author | David Oberhollenzer <david.oberhollenzer@tele2.at> | 2018-04-04 14:58:01 +0200 |
---|---|---|
committer | David Oberhollenzer <david.oberhollenzer@tele2.at> | 2018-04-04 14:58:01 +0200 |
commit | 04a23330e4a2085ee91980c223c5e4f089ebbe97 (patch) | |
tree | da0b02615fb21849a37cf4632c80df1569788dff /initd/main.c | |
parent | aa1356cb190a3416936b25f75ecaaa8684c6fcde (diff) |
Merge preprocessing of command lines
- Common function for splitting string into argument vector
- Preprocess & split command lines while parsing the service file
- Specify "before" and "after" dependencies in a single line
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
Diffstat (limited to 'initd/main.c')
-rw-r--r-- | initd/main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/initd/main.c b/initd/main.c index 9ce23c0..5f85641 100644 --- a/initd/main.c +++ b/initd/main.c @@ -53,7 +53,7 @@ static void handle_exited(service_t *svc) } } - svc->pid = runlst(svc->exec, svc->num_exec, svc->ctty); + svc->pid = runlst(svc->exec, svc->ctty); if (svc->pid == -1) { print_status(svc->desc, STATUS_FAIL, false); delsvc(svc); @@ -115,7 +115,7 @@ static void start_runlevel(int level) svc = cfg.targets[level]; cfg.targets[level] = svc->next; - if (!svc->num_exec) { + if (svc->exec == NULL) { print_status(svc->desc, STATUS_OK, false); delsvc(svc); continue; @@ -124,8 +124,7 @@ static void start_runlevel(int level) if (svc->type == SVC_WAIT) { print_status(svc->desc, STATUS_WAIT, false); - status = runlst_wait(svc->exec, svc->num_exec, - svc->ctty); + status = runlst_wait(svc->exec, svc->ctty); print_status(svc->desc, status == EXIT_SUCCESS ? @@ -136,7 +135,7 @@ static void start_runlevel(int level) if (svc->type == SVC_RESPAWN) print_status(svc->desc, STATUS_STARTED, false); - svc->pid = runlst(svc->exec, svc->num_exec, svc->ctty); + svc->pid = runlst(svc->exec, svc->ctty); if (svc->pid == -1) { print_status(svc->desc, STATUS_FAIL, false); delsvc(svc); |