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
@@ -19,9 +19,6 @@ const char conf_defname[] = "arch/$ARCH/defconfig";
 
 const char *conf_confnames[] = {
         ".config",
-        "/lib/modules/$UNAME_RELEASE/.config",
-        "/etc/kernel-config",
-        "/boot/config-$UNAME_RELEASE",
         conf_defname,
         NULL,
 };
@@ -105,11 +102,11 @@ int conf_read(const char *name)
                 case S_INT:
                 case S_HEX:
                 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;
                 }
         }
 
@@ -129,7 +126,7 @@ int conf_read(const char *name)
                         switch (sym->type) {
                         case S_BOOLEAN:
                         case S_TRISTATE:
-                                sym->def = symbol_no.curr;
+                                sym->user = symbol_no.curr;
                                 sym->flags &= ~SYMBOL_NEW;
                                 break;
                         default:
@@ -154,18 +151,18 @@ int conf_read(const char *name)
                         switch (sym->type) {
                         case S_TRISTATE:
                                 if (p[0] == 'm') {
-                                        S_TRI(sym->def) = mod;
+                                        sym->user.tri = mod;
                                         sym->flags &= ~SYMBOL_NEW;
                                         break;
                                 }
                         case S_BOOLEAN:
                                 if (p[0] == 'y') {
-                                        S_TRI(sym->def) = yes;
+                                        sym->user.tri = yes;
                                         sym->flags &= ~SYMBOL_NEW;
                                         break;
                                 }
                                 if (p[0] == 'n') {
-                                        S_TRI(sym->def) = no;
+                                        sym->user.tri = no;
                                         sym->flags &= ~SYMBOL_NEW;
                                         break;
                                 }
@@ -187,7 +184,7 @@ int conf_read(const char *name)
                         case S_INT:
                         case S_HEX:
                                 if (sym_string_valid(sym, p)) {
-                                        S_VAL(sym->def) = strdup(p);
+                                        sym->user.val = strdup(p);
                                         sym->flags &= ~SYMBOL_NEW;
                                 } else {
                                         fprintf(stderr, "%s:%d: symbol value '%s' invalid for %s\n", name, lineno, p, sym->name);
@@ -198,21 +195,21 @@ 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? */;
                                         break;
                                 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;
                                 case no:
                                         break;
                                 }
-                                S_TRI(prop->def->def) = S_TRI(sym->def);
+                                cs->user.tri = sym->user.tri;
                         }
                         break;
                 case '\n':
@@ -224,12 +221,27 @@ int conf_read(const char *name)
         fclose(in);
 
         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))
                         continue;
                 prop = sym_get_choice_prop(sym);
                 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;
         }
 
         sym_change_count = 1;
@@ -242,23 +254,45 @@ int conf_write(const char *name)
         FILE *out, *out_h;
         struct symbol *sym;
         struct menu *menu;
-        char oldname[128];
+        const char *basename;
+        char dirname[128], tmpname[128], newname[128];
         int type, l;
         const char *str;
 
-        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"
                      "# Automatically generated make config: don't edit\n"
                      "#\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");
 
         if (!sym_change_count)
                 sym_clear_all_valid();
@@ -274,10 +308,11 @@ int conf_write(const char *name)
                                      "#\n"
                                      "# %s\n"
                                      "#\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)) {
                         sym_calc_value(sym);
                         if (!(sym->flags & SYMBOL_WRITE))
@@ -286,7 +321,7 @@ int conf_write(const char *name)
                         type = sym->type;
                         if (type == S_TRISTATE) {
                                 sym_calc_value(modules_sym);
-                                if (S_TRI(modules_sym->curr) == no)
+                                if (modules_sym->curr.tri == no)
                                         type = S_BOOLEAN;
                         }
                         switch (type) {
@@ -295,15 +330,18 @@ int conf_write(const char *name)
                                 switch (sym_get_tristate_value(sym)) {
                                 case no:
                                         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;
                                 case mod:
                                         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;
                                 case yes:
                                         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;
                                 }
                                 break;
@@ -311,34 +349,40 @@ int conf_write(const char *name)
                                 // fix me
                                 str = sym_get_string_value(sym);
                                 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 {
                                         l = strcspn(str, "\"\\");
                                         if (l) {
                                                 fwrite(str, l, 1, out);
-                                                fwrite(str, l, 1, out_h);
+                                                if (out_h)
+                                                        fwrite(str, l, 1, out_h);
                                         }
                                         str += l;
                                         while (*str == '\\' || *str == '"') {
                                                 fprintf(out, "\\%c", *str);
-                                                fprintf(out_h, "\\%c", *str);
+                                                if (out_h)
+                                                        fprintf(out_h, "\\%c", *str);
                                                 str++;
                                         }
                                 } while (*str);
                                 fputs("\"\n", out);
-                                fputs("\"\n", out_h);
+                                if (out_h)
+                                        fputs("\"\n", out_h);
                                 break;
                         case S_HEX:
                                 str = sym_get_string_value(sym);
                                 if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
                                         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;
                                 }
                         case S_INT:
                                 str = sym_get_string_value(sym);
                                 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;
                         }
                 }
@@ -358,18 +402,18 @@ 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;
 
         sym_change_count = 0;