From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Fri, 13 Dec 2019 15:40:35 +0000 (+0100)
Subject: daemon/main: remove "-" from config array
X-Git-Tag: v5.0.0~18^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81c6cc9599b0f770cfb831fc444f9fa1eac2be43;p=thirdparty%2Fknot-resolver.git

daemon/main: remove "-" from config array
---

diff --git a/daemon/main.c b/daemon/main.c
index 98256c046..bfc1b44eb 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -765,10 +765,13 @@ int main(int argc, char **argv)
 
 	/* Select which config files to load and verify they are read-able. */
 	bool load_defaults = true;
-	for (size_t i = 0; i < args.config.len; ++i) {
+	size_t i = 0;
+	while (i < args.config.len) {
 		const char *config = args.config.at[i];
 		if (strcmp(config, "-") == 0) {
 			load_defaults = false;
+			array_del(args.config, i);
+			continue;  /* don't increment i */
 		} else if (access(config, R_OK) != 0) {
 			char cwd[PATH_MAX];
 			get_workdir(cwd, sizeof(cwd));
@@ -776,6 +779,7 @@ int main(int argc, char **argv)
 				config, cwd, strerror(errno));
 			return EXIT_FAILURE;
 		}
+		i++;
 	}
 	if (args.config.len == 0 && access("config", R_OK) == 0)
 		array_push(args.config, "config");
@@ -884,9 +888,9 @@ int main(int argc, char **argv)
 		goto cleanup;
 	}
 
-	for (size_t i = 0; i < args.config.len; ++i) {
+	for (i = 0; i < args.config.len; ++i) {
 		const char *config = args.config.at[i];
-		if (strcmp(config, "-") != 0 && engine_loadconf(&engine, config) != 0) {
+		if (engine_loadconf(&engine, config) != 0) {
 			ret = EXIT_FAILURE;
 			goto cleanup;
 		}