- Make equal-less parameters illegal

- parameters without argument after '=' are now assumed to be argument-less
- Add a testcase for space in stanza and various argument-less parameters


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1948 f882894a-f735-0410-b71e-b25c423dba1c

2 files changed, 13 insertions, 4 deletions

diff --git a/lib/tests/plugin.ini b/lib/tests/plugin.ini
index eb869c63..d07fc4f3 100644
--- a/lib/tests/plugin.ini
+++ b/lib/tests/plugin.ini
@@ -7,4 +7,9 @@ password=secret		# Remember to change later
 u=admin
 p=secret
 
+[check space_and_flags]
+foo=bar
+a=
+b=
+bar=
 
diff --git a/lib/tests/test_ini.c b/lib/tests/test_ini.c
index de9f8adf..9031f7f8 100644
--- a/lib/tests/test_ini.c
+++ b/lib/tests/test_ini.c
@@ -52,18 +52,18 @@ main (int argc, char **argv)
 {
 	char *optstr=NULL;
 
-	plan_tests(9);
+	plan_tests(10);
 
 	optstr=list2str(np_get_defaults("section@./config-tiny.ini", "check_disk"));
-	ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank="), "config-tiny.ini's section as expected");
+	ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"), "config-tiny.ini's section as expected");
 	my_free(optstr);
 
 	optstr=list2str(np_get_defaults("@./config-tiny.ini", "section"));
-	ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank="), "Used default section name, without specific");
+	ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"), "Used default section name, without specific");
 	my_free(optstr);
 
 	optstr=list2str(np_get_defaults("section_unknown@./config-tiny.ini", "section"));
-	ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank="), "Used default section name over specified one");
+	ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"), "Used default section name over specified one");
 	my_free(optstr);
 
 	optstr=list2str(np_get_defaults("Section Two@./config-tiny.ini", "check_disk"));
@@ -90,6 +90,10 @@ main (int argc, char **argv)
 	ok( !strcmp(optstr, "-u=admin -p=secret"), "plugin.ini's check_mysql2 as expected");
 	my_free(optstr);
 
+	optstr=list2str(np_get_defaults("check space_and_flags@./plugin.ini", "check_disk"));
+	ok( !strcmp(optstr, "--foo=bar -a -b --bar"), "plugin.ini space in stanza and flag arguments");
+	my_free(optstr);
+
 	return exit_status();
 }