Skip to contentSkip to conversation

kconfig: fix missing '# end of' for empty menu

PATCH New Masahiro Yamada 1 participant 1 message Feb 14, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kconfig: fix missing '# end of' for empty menu

Currently, "# end of ..." is inserted when the menu goes back to its parent.

Hence, an empty menu:

menu "Foo"
endmenu

... ends up with unbalanced menu comments, like this:

#
# Foo
#

Let's close the menu comments properly:

#
# Foo
#

  # end of Foo

---

 scripts/kconfig/confdata.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)
scripts/kconfig/confdata.c +13 -12
index d3c3a61308ad..36fd254fcaa1 100644
@@ -903,19 +903,20 @@ int conf_write(const char *name)
 			menu = menu->list;
 			continue;
 		}
-		if (menu->next)
+
+end_check:
+		if (!menu->sym && menu_is_visible(menu) && menu != &rootmenu &&
+		    menu->prompt->type == P_MENU) {
+			fprintf(out, "# end of %s\n", menu_get_prompt(menu));
+			need_newline = true;
+		}
+
+		if (menu->next) {
 			menu = menu->next;
-		else while ((menu = menu->parent)) {
-			if (!menu->sym && menu_is_visible(menu) &&
-			    menu != &rootmenu) {
-				str = menu_get_prompt(menu);
-				fprintf(out, "# end of %s\n", str);
-				need_newline = true;
-			}
-			if (menu->next) {
-				menu = menu->next;
-				break;
-			}
+		} else {
+			menu = menu->parent;
+			if (menu)
+				goto end_check;
 		}
 	}
 	fclose(out);
Signature · 1 line
2.32.0