cmdline: added "-C <config>" option

This option sets configuration options from command line, as specified in CONFIG_ITEM. CONFIG_ITEM must be a valid configuration string, so you'll likely need to quote it on the command line. The semicolon can be used as a separator, to stick several configuration items in the same argument. This option can also be used more than once on the same command line, to set different parameters. If used twice to set the same parameter, the last value overrides previous values -- and later config files, specified with "-f" may override -C values.

cmdline: added "-C <config>" option
This option sets configuration options from command line, as specified in CONFIG_ITEM. CONFIG_ITEM must be a valid configuration string, so you'll likely need to quote it on the command line. The semicolon can be used as a separator, to stick several configuration items in the same argument. This option can also be used more than once on the same command line, to set different parameters. If used twice to set the same parameter, the last value overrides previous values -- and later config files, specified with "-f" may override -C values.
c3a762b8 · Pietro Fezzardi · Alessandro Rubini · 22e1ca8d · c3a762b8 · c3a762b8
Commit c3a762b8 authored Oct 15, 2013 by Pietro Fezzardi Committed by Alessandro Rubini Oct 16, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

bare-startup.c lib-bare/bare-startup.c +7 -1

cmdline.c lib/cmdline.c +5 -0

No files found.
--- a/lib-bare/bare-startup.c
+++ b/lib-bare/bare-startup.c
@@ -73,10 +73,16 @@ int ppsi_main(int argc, char **argv)
 	return 0;
 }

-/* We can't parse a config file (no system calls, /me is lazy) */
+/* We can't parse a config file or string (no system calls, /me is lazy) */
 int pp_config_file(struct pp_globals *ppg, int force, char *fname)
 {
 	pp_printf("No support for config file: can't read \"%s\"\n",
 		  fname);
 	return -1;
 }
+
+int pp_config_string(struct pp_globals *ppg, char *s)
+{
+	pp_printf("No support for config options: can't parse \"%s\"\n", s);
+	return -1;
+}
--- a/lib/cmdline.c
+++ b/lib/cmdline.c
@@ -23,6 +23,8 @@ static struct cmd_line_opt cmd_line_list[] = {
 	//{"-d", "display stats"},
 	//{"-D", "display stats in .csv format"},
 	//{"-R", "record data about sync packets in a file"},
+	{"-C CONFIG_ITEM", "set configuration options as stated in CONFIG_ITEM\n\t"
+		"CONFIG_ITEM must be a valid config string, enclosed by \" \""},
 	{"-f FILE", "read configuration file"},
 	{"-V", "run in verbose mode"},
 	{"-d STRING", "diagnostic level (see diag-macros.h)"},
@@ -115,6 +117,9 @@ int pp_parse_cmdline(struct pp_globals *ppg, int argc, char **argv)
 			a = argv[++i];
 			pp_global_flags = pp_diag_parse(a);
 			break;
+		case 'C':
+			pp_config_string(ppg, argv[++i]);
+			break;
 		case 'f':
 			pp_config_file(ppg, 1, argv[++i]);
 			break;