Peter Kjellerstedt at axis.com writes:

Hello,

the attached patch should bring extra/config in line
with the Linux 2.6.7 sources.

The following are the commit messages for the respective
files from the Linux bk-repository:

checklist.c:
* fix menuconfig choice item help display

confdata.c:
* config: choice fix
* kconfig: don't rename target dir when saving config

expr.c, expr.h:
* config: disable debug prints

mconf.c:
* fix menuconfig choice item help display

menu.c:
* Kconfig: use select statements

symbol.c:
* config: choice fix
* Avoid bogus warning about recursive dependencies
* c99 struct initialiser conversions

textbox.c:
* janitor: don't init statics to 0

util.c:
* fix lxdialog behaviour

//Peter


git-svn-id: svn://busybox.net/trunk/busybox@8944 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 10 insertions, 2 deletions

diff --git a/scripts/config/confdata.c b/scripts/config/confdata.c
index c46aea81d..fd3a345e2 100644
--- a/scripts/config/confdata.c
+++ b/scripts/config/confdata.c
@@ -225,6 +225,8 @@ int conf_read(const char *name)
         }
         fclose(in);
 
+        if (modules_sym)
+                sym_calc_value(modules_sym);
         for_all_symbols(i, sym) {
                 sym_calc_value(sym);
                 if (sym_has_value(sym) && !sym_is_choice_value(sym)) {
@@ -265,8 +267,14 @@ int conf_write(const char *name)
 
         dirname[0] = 0;
         if (name && name[0]) {
-                char *slash = strrchr(name, '/');
-                if (slash) {
+                struct stat st;
+                char *slash;
+
+                if (!stat(name, &st) && S_ISDIR(st.st_mode)) {
+                        strcpy(dirname, name);
+                        strcat(dirname, "/");
+                        basename = conf_def_filename;
+                } else if ((slash = strrchr(name, '/'))) {
                         int size = slash - name + 1;
                         memcpy(dirname, name, size);
                         dirname[size] = 0;