Simplify, drop ifdef: let if: become ifdef

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>

src/conf.c

@@ -1070,7 +1070,7 @@ int conf_reload(void)
 	/* Mark any reverse deps as chenaged. */
 	service_update_rdeps();
 
-	/* Prune according to ifdef:[!]ident */
+	/* Prune according to if:[!]ident or if:<[!]cond> */
 	service_mark_unavail();
 
 	/* Set up top-level cgroups */

src/service.c

@@ -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);
 	}
 }

src/svc.c

@@ -686,6 +686,14 @@ int svc_conflicts(svc_t *svc)
 	return rc;
 }
 
+/**
+ * svc_ifthen - Check if: statement in declaration
+ * @ident:   svc_t identififcation (name:id)
+ * @stmt:    if: statement from .conf file
+ *
+ * Returns:
+ * %TRUE(1) yes, use this svc_t, %FALSE(0) prune
+ */
 int svc_ifthen(const char *ident, char *stmt)
 {
 	int not = 0;
@@ -710,11 +718,11 @@ int svc_ifthen(const char *ident, char *stmt)
 
 		cond = cond_get(stmt);
 		if (not && cond == COND_ON) {
-			dbg("skipping %s, cond %s is on", ident, stmt);
+			logit(LOG_NOTICE, "skipping %s, cond %s is on.", ident, stmt);
 			return 0;
 		}
 		if (!not && cond == COND_OFF) {
-			dbg("skipping %s, cond %s is off", ident, stmt);
+			logit(LOG_NOTICE, "skipping %s, cond %s is off.", ident, stmt);
 			return 0;
 		}
 		return 1;
@@ -727,11 +735,11 @@ int svc_ifthen(const char *ident, char *stmt)
 
 	svc = svc_find_by_str(stmt);
 	if (not && svc) {
-		dbg("skipping %s, %s already loaded.", ident, svc_ident(svc, NULL, 0));
+		logit(LOG_NOTICE, "skipping %s, %s already loaded.", ident, svc_ident(svc, NULL, 0));
 		return 0;
 	}
 	if (!not && !svc) {
-		dbg("skipping %s, %s not available.", ident, stmt);
+		logit(LOG_NOTICE, "skipping %s, %s not available.", ident, stmt);
 		return 0;
 	}
 

src/svc.h

@@ -138,7 +138,7 @@ typedef struct svc {
 	int            job;	       /* For intenal use only, canonical ref is NAME:ID */
 	char           name[MAX_ARG_LEN];
 	char           id[MAX_ID_LEN]; /* :ID */
-	char           ifdef[MAX_IDENT_LEN];
+	char           ifstmt[MAX_IDENT_LEN];
 
 	/* Counters */
 	char           once;	       /* run/task, (at least) once per runlevel */