summaryrefslogtreecommitdiff
path: root/scripts/kconfig/confdata.c
Side-by-side diff
Diffstat (limited to 'scripts/kconfig/confdata.c') (more/less context) (ignore whitespace changes)
-rw-r--r--scripts/kconfig/confdata.c152
1 files changed, 98 insertions, 54 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 9bf7af9..f3796ce 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -21,5 +21,2 @@ const char *conf_confnames[] = {
".config",
- "/lib/modules/$UNAME_RELEASE/.config",
- "/etc/kernel-config",
- "/boot/config-$UNAME_RELEASE",
conf_defname,
@@ -107,7 +104,7 @@ int conf_read(const char *name)
case S_STRING:
- if (S_VAL(sym->def))
- free(S_VAL(sym->def));
+ if (sym->user.val)
+ free(sym->user.val);
default:
- S_VAL(sym->def) = NULL;
- S_TRI(sym->def) = no;
+ sym->user.val = NULL;
+ sym->user.tri = no;
}
@@ -131,3 +128,3 @@ int conf_read(const char *name)
case S_TRISTATE:
- sym->def = symbol_no.curr;
+ sym->user = symbol_no.curr;
sym->flags &= ~SYMBOL_NEW;
@@ -156,3 +153,3 @@ int conf_read(const char *name)
if (p[0] == 'm') {
- S_TRI(sym->def) = mod;
+ sym->user.tri = mod;
sym->flags &= ~SYMBOL_NEW;
@@ -162,3 +159,3 @@ int conf_read(const char *name)
if (p[0] == 'y') {
- S_TRI(sym->def) = yes;
+ sym->user.tri = yes;
sym->flags &= ~SYMBOL_NEW;
@@ -167,3 +164,3 @@ int conf_read(const char *name)
if (p[0] == 'n') {
- S_TRI(sym->def) = no;
+ sym->user.tri = no;
sym->flags &= ~SYMBOL_NEW;
@@ -189,3 +186,3 @@ int conf_read(const char *name)
if (sym_string_valid(sym, p)) {
- S_VAL(sym->def) = strdup(p);
+ sym->user.val = strdup(p);
sym->flags &= ~SYMBOL_NEW;
@@ -200,6 +197,6 @@ int conf_read(const char *name)
if (sym_is_choice_value(sym)) {
- prop = sym_get_choice_prop(sym);
- switch (S_TRI(sym->def)) {
+ struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
+ switch (sym->user.tri) {
case mod:
- if (S_TRI(prop->def->def) == yes)
+ if (cs->user.tri == yes)
/* warn? */;
@@ -207,5 +204,5 @@ int conf_read(const char *name)
case yes:
- if (S_TRI(prop->def->def) != no)
+ if (cs->user.tri != no)
/* warn? */;
- S_VAL(prop->def->def) = sym;
+ cs->user.val = sym;
break;
@@ -214,3 +211,3 @@ int conf_read(const char *name)
}
- S_TRI(prop->def->def) = S_TRI(sym->def);
+ cs->user.tri = sym->user.tri;
}
@@ -226,2 +223,16 @@ int conf_read(const char *name)
for_all_symbols(i, sym) {
+ sym_calc_value(sym);
+ if (sym_has_value(sym)) {
+ if (sym->visible == no)
+ sym->flags |= SYMBOL_NEW;
+ switch (sym->type) {
+ case S_STRING:
+ case S_INT:
+ case S_HEX:
+ if (!sym_string_within_range(sym, sym->user.val))
+ sym->flags |= SYMBOL_NEW;
+ default:
+ break;
+ }
+ }
if (!sym_is_choice(sym))
@@ -230,4 +241,5 @@ int conf_read(const char *name)
sym->flags &= ~SYMBOL_NEW;
- for (e = prop->dep; e; e = e->left.expr)
- sym->flags |= e->right.sym->flags & SYMBOL_NEW;
+ for (e = prop->expr; e; e = e->left.expr)
+ if (e->right.sym->visible != no)
+ sym->flags |= e->right.sym->flags & SYMBOL_NEW;
}
@@ -244,3 +256,4 @@ int conf_write(const char *name)
struct menu *menu;
- char oldname[128];
+ const char *basename;
+ char dirname[128], tmpname[128], newname[128];
int type, l;
@@ -248,8 +261,28 @@ int conf_write(const char *name)
- out = fopen(".tmpconfig", "w");
+ dirname[0] = 0;
+ if (name && name[0]) {
+ char *slash = strrchr(name, '/');
+ if (slash) {
+ int size = slash - name + 1;
+ memcpy(dirname, name, size);
+ dirname[size] = 0;
+ if (slash[1])
+ basename = slash + 1;
+ else
+ basename = conf_def_filename;
+ } else
+ basename = name;
+ } else
+ basename = conf_def_filename;
+
+ sprintf(newname, "%s.tmpconfig.%d", dirname, getpid());
+ out = fopen(newname, "w");
if (!out)
return 1;
- out_h = fopen(".tmpconfig.h", "w");
- if (!out_h)
- return 1;
+ out_h = NULL;
+ if (!name) {
+ out_h = fopen(".tmpconfig.h", "w");
+ if (!out_h)
+ return 1;
+ }
fprintf(out, "#\n"
@@ -257,6 +290,7 @@ int conf_write(const char *name)
"#\n");
- fprintf(out_h, "/*\n"
- " * Automatically generated C config: don't edit\n"
- " */\n"
- "#define AUTOCONF_INCLUDED\n");
+ if (out_h)
+ fprintf(out_h, "/*\n"
+ " * Automatically generated C config: don't edit\n"
+ " */\n"
+ "#define AUTOCONF_INCLUDED\n");
@@ -276,6 +310,7 @@ int conf_write(const char *name)
"#\n", str);
- fprintf(out_h, "\n"
- "/*\n"
- " * %s\n"
- " */\n", str);
+ if (out_h)
+ fprintf(out_h, "\n"
+ "/*\n"
+ " * %s\n"
+ " */\n", str);
} else if (!(sym->flags & SYMBOL_CHOICE)) {
@@ -288,3 +323,3 @@ int conf_write(const char *name)
sym_calc_value(modules_sym);
- if (S_TRI(modules_sym->curr) == no)
+ if (modules_sym->curr.tri == no)
type = S_BOOLEAN;
@@ -297,3 +332,4 @@ int conf_write(const char *name)
fprintf(out, "# CONFIG_%s is not set\n", sym->name);
- fprintf(out_h, "#undef CONFIG_%s\n", sym->name);
+ if (out_h)
+ fprintf(out_h, "#undef CONFIG_%s\n", sym->name);
break;
@@ -301,3 +337,4 @@ int conf_write(const char *name)
fprintf(out, "CONFIG_%s=m\n", sym->name);
- fprintf(out_h, "#define CONFIG_%s_MODULE 1\n", sym->name);
+ if (out_h)
+ fprintf(out_h, "#define CONFIG_%s_MODULE 1\n", sym->name);
break;
@@ -305,3 +342,4 @@ int conf_write(const char *name)
fprintf(out, "CONFIG_%s=y\n", sym->name);
- fprintf(out_h, "#define CONFIG_%s 1\n", sym->name);
+ if (out_h)
+ fprintf(out_h, "#define CONFIG_%s 1\n", sym->name);
break;
@@ -313,3 +351,4 @@ int conf_write(const char *name)
fprintf(out, "CONFIG_%s=\"", sym->name);
- fprintf(out_h, "#define CONFIG_%s \"", sym->name);
+ if (out_h)
+ fprintf(out_h, "#define CONFIG_%s \"", sym->name);
do {
@@ -318,3 +357,4 @@ int conf_write(const char *name)
fwrite(str, l, 1, out);
- fwrite(str, l, 1, out_h);
+ if (out_h)
+ fwrite(str, l, 1, out_h);
}
@@ -323,3 +363,4 @@ int conf_write(const char *name)
fprintf(out, "\\%c", *str);
- fprintf(out_h, "\\%c", *str);
+ if (out_h)
+ fprintf(out_h, "\\%c", *str);
str++;
@@ -328,3 +369,4 @@ int conf_write(const char *name)
fputs("\"\n", out);
- fputs("\"\n", out_h);
+ if (out_h)
+ fputs("\"\n", out_h);
break;
@@ -334,3 +376,4 @@ int conf_write(const char *name)
fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
- fprintf(out_h, "#define CONFIG_%s 0x%s\n", sym->name, str);
+ if (out_h)
+ fprintf(out_h, "#define CONFIG_%s 0x%s\n", sym->name, str);
break;
@@ -340,3 +383,4 @@ int conf_write(const char *name)
fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
- fprintf(out_h, "#define CONFIG_%s %s\n", sym->name, str);
+ if (out_h)
+ fprintf(out_h, "#define CONFIG_%s %s\n", sym->name, str);
break;
@@ -360,14 +404,14 @@ int conf_write(const char *name)
fclose(out);
- fclose(out_h);
-
- if (!name) {
+ if (out_h) {
+ fclose(out_h);
rename(".tmpconfig.h", "include/linux/autoconf.h");
- name = conf_def_filename;
- file_write_dep(NULL);
- } else
- unlink(".tmpconfig.h");
-
- sprintf(oldname, "%s.old", name);
- rename(name, oldname);
- if (rename(".tmpconfig", name))
+ }
+ if (!name || basename != conf_def_filename) {
+ if (!name)
+ name = conf_def_filename;
+ sprintf(tmpname, "%s.old", name);
+ rename(name, tmpname);
+ }
+ sprintf(tmpname, "%s%s", dirname, basename);
+ if (rename(newname, tmpname))
return 1;