Fix dot-config parsing error

The parser must take care of the help text because it can contains KConfig keywords. So, this fix identifies help sections and does not parse the help text.

Fix dot-config parsing error
The parser must take care of the help text because it can contains KConfig keywords. So, this fix identifies help sections and does not parse the help text.
c21ed26c · Jean-Claude BAU · ea7f0af8 · c21ed26c
Commit c21ed26c authored Jan 07, 2020 by Jean-Claude BAU
Hide whitespace changes
Inline Side-by-side

Showing with 27 additions and 2 deletions

dot-config.c userspace/libwr/dot-config.c +27 -2

No files found.
--- a/userspace/libwr/dot-config.c
+++ b/userspace/libwr/dot-config.c
@@ -203,6 +203,7 @@ static int libwr_cfg_read_kconfig(struct kc **all_configs,
 	struct kc *kc;
 	int ret = 0;
 	int len;
+	int helpIndentation=-1; // Not in help

 	/* Prevent infinite recursion */
 	if (depth_level >= READ_KCONFIG_MAX_DEPTH) {
@@ -227,10 +228,34 @@ static int libwr_cfg_read_kconfig(struct kc **all_configs,
 		return -1;
 	while (fgets(s, sizeof(s), f)) {
 		char *ss=s;
+		int indentation=0;

-		/* Remove leading spaces */
-		while ( *ss==' ' || *ss=='\t')
+		/* The indentation must be measured to make the difference between
+		 * a key word or a text in help section
+		 */
+
+		/* Remove leading spaces and measure indentation */
+		while ( *ss==' ' || *ss=='\t') {
+			indentation++;
 			ss++;
+		}
+
+		if (helpIndentation==-1 ) {
+			// Not in help section
+			if (strncmp(ss,"help",4)==0 || strncmp(ss,"---help---",10)==0 ) {
+				// Enter in help section
+				helpIndentation=indentation;
+				continue;
+			}
+		} else {
+			// In help section
+			if ( indentation>=helpIndentation )
+				continue; // Still in help section
+			helpIndentation=-1; // Exiting help section
+		}
+
+		if ( *ss==0 || *ss=='\n' || *ss=='#' )
+			continue;

 		if (sscanf(ss, "source %s", name) == 1) {
 			/* Recursive call for sourced files */