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

Simplify, drop ifdef: let if: become ifdef

Browse Source 
Post audit, concensus is to drop if: and always do post-eval of all
ifdef: statements.  Also, rename ifdef: to if: for completeness.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2023-03-06 17:03:37 +01:00
1 parent 571250a9b9
commit 44d0d87ad3
4 files changed
+20 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/service.c
+6 -20
View File
@@ -1395,7 +1395,7 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
char *id = NULL, *env = NULL, *cgroup = NULL;
char *pre_script = NULL, *post_script = NULL;
char *ready_script = NULL, *conflict = NULL;
char *ifdef = NULL, *ifstmt = NULL;
char *ifstmt = NULL;
char *notify = NULL;
struct tty tty = { 0 };
char *dev = NULL;
@@ -1510,8 +1510,6 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
conflict = arg;
else if (MATCH_CMD(cmd, "if:", arg))
ifstmt = arg;
else if (MATCH_CMD(cmd, "ifdef:", arg))
ifdef = arg;
else
break;
@@ -1525,18 +1523,6 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
if (!id)
id = "";
if (ifstmt) {
char ident[MAX_IDENT_LEN];
if (id[0]) {
snprintf(ident, sizeof(ident), "%s:%s", name, id);
} else
strlcpy(ident, name, sizeof(ident));
if (!svc_ifthen(ident, ifstmt))
return 0;
}
levels = conf_parse_runlevels(runlevels);
if (runlevel > 0 && !ISOTHER(levels, 0)) {
dbg("Skipping %s%s%s, bootstrap is completed.",
@@ -1727,10 +1713,10 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
strlcpy(svc->conflict, conflict, sizeof(svc->conflict));
else
memset(svc->conflict, 0, sizeof(svc->conflict));
if (ifdef)
strlcpy(svc->ifdef, ifdef, sizeof(svc->ifdef));
if (ifstmt)
strlcpy(svc->ifstmt, ifstmt, sizeof(svc->ifstmt));
else
memset(svc->ifdef, 0, sizeof(svc->ifdef));
memset(svc->ifstmt, 0, sizeof(svc->ifstmt));
svc->manual = manual;
svc->respawn = respawn;
svc->forking = forking;
@@ -1929,10 +1915,10 @@ void service_mark_unavail(void)
for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) {
char buf[MAX_IDENT_LEN];
if (!svc->ifdef[0])
if (!svc->ifstmt[0])
continue;
if (!svc_ifthen(svc_ident(svc, buf, sizeof(buf)), svc->ifdef))
if (!svc_ifthen(svc_ident(svc, buf, sizeof(buf)), svc->ifstmt))
svc_mark(svc);
}
}