From 885808c64cbe7c1f87a78f9ea2aed22de53c5721 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Mon, 7 Feb 2022 10:01:28 +0100 Subject: [PATCH 1/2] service.c: fix a regression A regression was introduced by commit f0f358a1: [ service.c: set/clear condition 'done' for run tasks ] svc->type is a integer but mistakenly being used as string, which will cause crash. Signed-off-by: Ming Liu --- src/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service.c b/src/service.c index 062fb390..d44fb246 100644 --- a/src/service.c +++ b/src/service.c @@ -1709,7 +1709,7 @@ static void svc_set_state(svc_t *svc, svc_state_t new) if (svc_is_runtask(svc)) { char cond[MAX_COND_LEN]; - snprintf(cond, sizeof(cond), "%s/%s/done", svc->type, svc->name); + snprintf(cond, sizeof(cond), "%s/%s/done", svc_typestr(svc), svc->name); /* create done condition when entering SVC_DONE_STATE. */ if (*state == SVC_DONE_STATE) From 85b2089fd37548d4ada359547358eedd7e2abcd7 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Mon, 7 Feb 2022 11:36:22 +0100 Subject: [PATCH 2/2] initctl.c: fix a incosistent coding sytle Signed-off-by: Ming Liu --- src/initctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/initctl.c b/src/initctl.c index 786f6435..01450025 100644 --- a/src/initctl.c +++ b/src/initctl.c @@ -292,7 +292,7 @@ static int dump_one_cond(const char *fpath, const struct stat *sb, int tflag, st if (strncmp("pid/", cond, 4) == 0) { svc_t *svc; - svc= client_svc_find_by_cond(cond); + svc = client_svc_find_by_cond(cond); if (!svc) { nm = "unknown"; pid = 0;