wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-21 11:29:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added implementation for the new command INIT_CMD_SIGNAL.

Browse Source 
The implementation looks up the named service by using
`svc_parse_jobstr`. The callbacks for `svc_parse_jobstr` has been
augmented to accept a user data parameter. For this use case,
a carrier for the actual signal was needed. The address of the
signal parameter is taken and passed on as a `void *`. The
callback then simply deferences it as an int - the signal number.
This commit is contained in:
Jörgen Sigvardsson committed 2022-02-15 12:29:40 +01:00
1 parent 62da379472
commit 4121113688
4 files changed
+50 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/svc.c
+9 -9
View File
@@ -650,7 +650,7 @@ static char *tokstr(char *str, size_t len)
/*
* Used by api.c (to start/stop/restart) and initctl.c (for input validation)
*/
int svc_parse_jobstr(char *str, size_t len, int (*found)(svc_t *), int (not_found)(char *, char *))
int svc_parse_jobstr(char *str, size_t len, void *user_data, int (*found)(svc_t *, void *), int (not_found)(char *, char *, void *))
{
char *input, *token;
int result = 0;
@@ -686,11 +686,11 @@ int svc_parse_jobstr(char *str, size_t len, int (*found)(svc_t *), int (not_foun
if (!ptr) {
svc = svc_job_iterator(&iter, 1, job);
if (!svc && not_found)
result += not_found(NULL, token);
result += not_found(NULL, token, user_data);
while (svc) {
if (found)
result += found(svc);
result += found(svc, user_data);
svc = svc_job_iterator(&iter, 0, job);
}
} else {
@@ -699,19 +699,19 @@ int svc_parse_jobstr(char *str, size_t len, int (*found)(svc_t *), int (not_foun
svc = svc_find_by_jobid(job, id);
if (!svc && not_found)
result += not_found(token, id);
result += not_found(token, id, user_data);
else if (found)
result += found(svc);
result += found(svc, user_data);
}
} else {
if (!ptr) {
svc = svc_named_iterator(&iter, 1, token);
if (!svc && not_found)
result += not_found(token, id);
result += not_found(token, id, user_data);
while (svc) {
if (found)
result += found(svc);
result += found(svc, user_data);
svc = svc_named_iterator(&iter, 0, token);
}
} else {
@@ -720,9 +720,9 @@ int svc_parse_jobstr(char *str, size_t len, int (*found)(svc_t *), int (not_foun
svc = svc_find_by_nameid(token, id);
if (!svc && not_found)
result += not_found(token, id);
result += not_found(token, id, user_data);
else if (found)
result += found(svc);
result += found(svc, user_data);
}
}