parse_params(): allow processing of lone tokens

f00b4r0 · Sep 2, 2024 · 57e1e63 · 57e1e63
1 parent cd5e4c1
commit 57e1e63
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/acarsdec.c b/acarsdec.c
@@ -580,7 +580,7 @@ char * parse_params(char **paramsp, struct params_s *sp, const int np)
 	while ((param = strsep(paramsp, ","))) {
 		sep = strchr(param, '=');
 		if (!sep)
-			continue;
+			return param;
 
 		*sep++ = '\0';
 

diff --git a/fileout.c b/fileout.c
@@ -87,7 +87,7 @@ fileout_t *Fileoutinit(char *params)
 
 	retp = parse_params(&params, filep, ARRAY_SIZE(filep));
 	if (retp) {
-		fprintf(stderr, ERRPFX "unknown parameter '%s'\n", retp);
+		fprintf(stderr, ERRPFX "invalid parameter '%s'\n", retp);
 		return NULL;
 	}
 

diff --git a/mqttout.c b/mqttout.c
@@ -50,7 +50,9 @@ mqttout_t *MQTTinit(char *params)
 	do {
 		retp = parse_params(&params, mqttp, ARRAY_SIZE(mqttp));
 		if (retp) {
-			sep = strchr(retp, '=');	// guaranteed to exist due to parse_params()
+			sep = strchr(retp, '=');
+			if (!sep)
+				goto unknown;
 			*sep++ = '\0';
 			if (!strcmp("uri", retp)) {
 				if (url > &urls[14])
@@ -59,7 +61,8 @@ mqttout_t *MQTTinit(char *params)
 					*url++ = sep;
 			}
 			else {
-				fprintf(stderr, ERRPFX "unknown parameter '%s'\n", retp);
+unknown:
+				fprintf(stderr, ERRPFX "invalid parameter '%s'\n", retp);
 				return NULL;
 
 			}

diff --git a/netout.c b/netout.c
@@ -51,7 +51,7 @@ netout_t *Netoutinit(char *params)
 
 	retp = parse_params(&params, netp, ARRAY_SIZE(netp));
 	if (retp) {
-		fprintf(stderr, ERRPFX "unknown parameter '%s'\n", retp);
+		fprintf(stderr, ERRPFX "invalid parameter '%s'\n", retp);
 		return NULL;
 	}
 

diff --git a/statsd.c b/statsd.c
@@ -61,7 +61,7 @@ int statsd_init(char *params, const char *idstation)
 
 	retp = parse_params(&params, statsdp, ARRAY_SIZE(statsdp));
 	if (retp) {
-		fprintf(stderr, ERRPFX "unknown parameter '%s'\n", retp);
+		fprintf(stderr, ERRPFX "invalid parameter '%s'\n", retp);
 		return -1;
 	}