wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-10 16:52:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

Add support to specify service ID as a string

Browse Source 
Signed-off-by: Jonas Johansson <jonasj76@gmail.com>
This commit is contained in:
Jonas Johansson
2018-12-11 16:43:05 +01:00
parent a36aade7f4
commit f5f1a55747
7 changed files with 91 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api.c
+26 -9
View File
@@ -93,17 +93,16 @@ static int do_stop (char *buf, size_t len) { return call(stop, buf, len); }
static int do_restart(char *buf, size_t len) { return call(restart, buf, len); }
static char query_buf[368];
static int missing(char *job, int id)
static int missing(char *job, char *id)
{
char buf[20];
char idstr[13] = "";
if (!job)
job = "";
if (id > 1)
snprintf(idstr, sizeof(idstr), ":%d", id);
if (!id)
id = "";
snprintf(buf, sizeof(buf), "%s%s ", job, idstr);
snprintf(buf, sizeof(buf), "%s:%s ", job, id);
strlcat(query_buf, buf, sizeof(query_buf));
return 1;
@@ -122,8 +121,9 @@ static int do_query(struct init_request *rq, size_t len)
static svc_t *do_find(char *buf, size_t len)
{
int id = 1;
char *id = NULL;
char *ptr, *input;
svc_t *iter = NULL;
input = sanitize(buf, len);
if (!input)
@@ -132,11 +132,28 @@ static svc_t *do_find(char *buf, size_t len)
ptr = strchr(input, ':');
if (ptr) {
*ptr++ = 0;
id = atonum(ptr);
id = ptr;
}
if (isdigit(input[0]))
return svc_find_by_jobid(atonum(input), id);
if (isdigit(input[0])) {
char *ep;
long job = 0;
errno = 0;
job = strtol(input, &ep, 10);
if ((errno == ERANGE && (job == LONG_MAX || job == LONG_MIN)) ||
(errno != 0 && job == 0) ||
(input == ep))
return NULL;
if (!id)
return svc_job_iterator(&iter, 1, job);
return svc_find_by_jobid(job, id);
}
if (!id)
return svc_named_iterator(&iter, 1, input);
return svc_find_by_nameid(input, id);
}