hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kconfig: deduplicate code in conf_read_simple()

Browse Source 
[ Upstream commit d854b4b21de684a16a7d6163c7b0e9c5ff8a09d3 ]

Kconfig accepts both "# CONFIG_FOO is not set" and "CONFIG_FOO=n" as
a valid input, but conf_read_simple() duplicates similar code to handle
them. Factor out the common code.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Stable-dep-of: a409fc1463d6 ("kconfig: fix memory leak in sym_warn_unmet_dep()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Masahiro Yamada 2023-11-18 16:59:09 +09:00 committed by Greg Kroah-Hartman
parent d2a7e49ae2
commit ccc65c06b1
1 changed files with 35 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
scripts/kconfig/confdata.c
View File

@ -346,11 +346,10 @@ int conf_read_simple(const char *name, int def)
FILE *in = NULL; FILE *in = NULL;
char *line = NULL; char *line = NULL;
size_t line_asize = 0; size_t line_asize = 0;
char *p, *p2; char *p, *p2, *val;
struct symbol *sym; struct symbol *sym;
int i, def_flags; int i, def_flags;
const char *warn_unknown; const char *warn_unknown, *werror, *sym_name;
const char *werror;
warn_unknown = getenv("KCONFIG_WARN_UNKNOWN_SYMBOLS"); warn_unknown = getenv("KCONFIG_WARN_UNKNOWN_SYMBOLS");
werror = getenv("KCONFIG_WERROR"); werror = getenv("KCONFIG_WERROR");
@ -430,77 +429,34 @@ load:
while (compat_getline(&line, &line_asize, in) != -1) { while (compat_getline(&line, &line_asize, in) != -1) {
conf_lineno++; conf_lineno++;
sym = NULL;
if (line[0] == '#') { if (line[0] == '#') {
if (line[1] != ' ') if (line[1] != ' ')
continue; continue;
if (memcmp(line + 2, CONFIG_, strlen(CONFIG_))) p = line + 2;
if (memcmp(p, CONFIG_, strlen(CONFIG_)))
continue; continue;
p = strchr(line + 2 + strlen(CONFIG_), ' '); sym_name = p + strlen(CONFIG_);
p = strchr(sym_name, ' ');
if (!p) if (!p)
continue; continue;
*p++ = 0; *p++ = 0;
if (strncmp(p, "is not set", 10)) if (strncmp(p, "is not set", 10))
continue; continue;
sym = sym_find(line + 2 + strlen(CONFIG_)); val = "n";
if (!sym) {
if (warn_unknown)
conf_warning("unknown symbol: %s",
line + 2 + strlen(CONFIG_));
conf_set_changed(true);
continue;
}
if (sym->flags & def_flags) {
conf_warning("override: reassigning to symbol %s", sym->name);
}
switch (sym->type) {
case S_BOOLEAN:
case S_TRISTATE:
sym->def[def].tri = no;
sym->flags |= def_flags;
break;
default:
;
}
} else if (memcmp(line, CONFIG_, strlen(CONFIG_)) == 0) { } else if (memcmp(line, CONFIG_, strlen(CONFIG_)) == 0) {
p = strchr(line + strlen(CONFIG_), '='); sym_name = line + strlen(CONFIG_);
p = strchr(sym_name, '=');
if (!p) if (!p)
continue; continue;
*p++ = 0; *p++ = 0;
val = p;
p2 = strchr(p, '\n'); p2 = strchr(p, '\n');
if (p2) { if (p2) {
*p2-- = 0; *p2-- = 0;
if (*p2 == '\r') if (*p2 == '\r')
*p2 = 0; *p2 = 0;
} }
sym = sym_find(line + strlen(CONFIG_));
if (!sym) {
if (def == S_DEF_AUTO) {
/*
* Reading from include/config/auto.conf
* If CONFIG_FOO previously existed in
* auto.conf but it is missing now,
* include/config/FOO must be touched.
*/
conf_touch_dep(line + strlen(CONFIG_));
} else {
if (warn_unknown)
conf_warning("unknown symbol: %s",
line + strlen(CONFIG_));
conf_set_changed(true);
}
continue;
}
if (sym->flags & def_flags) {
conf_warning("override: reassigning to symbol %s", sym->name);
}
if (conf_set_sym_val(sym, def, def_flags, p))
continue;
} else { } else {
if (line[0] != '\r' && line[0] != '\n') if (line[0] != '\r' && line[0] != '\n')
conf_warning("unexpected data: %.*s", conf_warning("unexpected data: %.*s",
@ -509,6 +465,31 @@ load:
continue; continue;
} }
sym = sym_find(sym_name);
if (!sym) {
if (def == S_DEF_AUTO) {
/*
* Reading from include/config/auto.conf.
* If CONFIG_FOO previously existed in auto.conf
* but it is missing now, include/config/FOO
* must be touched.
*/
conf_touch_dep(sym_name);
} else {
if (warn_unknown)
conf_warning("unknown symbol: %s", sym_name);
conf_set_changed(true);
}
continue;
}
if (sym->flags & def_flags)
conf_warning("override: reassigning to symbol %s", sym->name);
if (conf_set_sym_val(sym, def, def_flags, val))
continue;
if (sym && sym_is_choice_value(sym)) { if (sym && sym_is_choice_value(sym)) {
struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym)); struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
switch (sym->def[def].tri) { switch (sym->def[def].tri) {