config: fixed some error detection and printouts

previously one could use config options without arguments, or config options with wrong names, and the program did not complain. now you have to use correct names for config options and only options with type ARG_NONE can be without arguments. hardcoded default config file and config string are supposed always correct so there's still no error check on their parsing. however for any config options passed from command line with -f or -C all the checks are enabled. if there are some syntax errors or options without value the process exits with errors, printing informations on all the found configuration errors.

config: fixed some error detection and printouts
previously one could use config options without arguments, or config options with wrong names, and the program did not complain. now you have to use correct names for config options and only options with type ARG_NONE can be without arguments. hardcoded default config file and config string are supposed always correct so there's still no error check on their parsing. however for any config options passed from command line with -f or -C all the checks are enabled. if there are some syntax errors or options without value the process exits with errors, printing informations on all the found configuration errors.
0e2f8cb2 · Pietro Fezzardi · e6748f4c · 0e2f8cb2 · 0e2f8cb2
Commit 0e2f8cb2 authored Feb 19, 2014 by Pietro Fezzardi
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 4 deletions

cmdline.c lib/cmdline.c +4 -2

conf.c lib/conf.c +7 -2

No files found.
--- a/lib/cmdline.c
+++ b/lib/cmdline.c
@@ -113,10 +113,12 @@ int pp_parse_cmdline(struct pp_globals *ppg, int argc, char **argv)
 			pp_global_flags = pp_diag_parse(a);
 			break;
 		case 'C':
-			pp_config_string(ppg, argv[++i]);
+			if (pp_config_string(ppg, argv[++i]) != 0)
+				return -1;
 			break;
 		case 'f':
-			pp_config_file(ppg, 1, argv[++i]);
+			if (pp_config_file(ppg, 1, argv[++i]) != 0)
+				return -1;
 			break;
 		case 'x':
 			GOPTS(ppg)->no_rst_clk = 1;

--- a/lib/conf.c
+++ b/lib/conf.c
@@ -271,8 +271,13 @@ static int pp_config_line(struct pp_globals *ppg, char *line, int lineno)
 				break;

 	if (!l->f) {
-		pp_diag(NULL, config, 1, "line %i: no such keyword \"%s\"\n",
-			lineno, word);
+		pp_error("line %i: no such keyword \"%s\"\n", lineno, word);
+		return -1;
+	}
+
+	if ((l->t != ARG_NONE) && (!*line)) {
+		pp_error("line %i: no argument for option \"%s\"\n", lineno,
+									word);
 		return -1;
 	}