The previous commit left confdata writing out:

CONFIG_NUMERIC_CONSTANT=

And on reading it back in, it would complain that '' was an invalid value for
that field.  I.E. "make allnoconfig && make" worked fine, but
"make allnoconfig && make menuconfig" barfed reading in the config file.

So now I have it write out "0" as the blank value.  (It's initialized to the
default value when the menu becomes visible anyway; I checked.)  That seems
to work.


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

1 files changed, 2 insertions, 3 deletions

diff --git a/scripts/config/confdata.c b/scripts/config/confdata.c
index 1d1b61e2b..78f3b20a7 100644
--- a/scripts/config/confdata.c
+++ b/scripts/config/confdata.c
@@ -396,21 +396,20 @@ int conf_write(const char *name)
                         case S_HEX:
                                 str = sym_get_string_value(sym);
                                 if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
-                                        fprintf(out, "%s=%s\n", sym->name, str);
+                                        fprintf(out, "%s=%s\n", sym->name, *str ? str : "0");
                                         if (out_h)
                                                 fprintf(out_h, "#define %s 0x%s\n", sym->name, str);
                                         break;
                                 }
                         case S_INT:
                                 str = sym_get_string_value(sym);
-                                fprintf(out, "%s=%s\n", sym->name, str);
+                                fprintf(out, "%s=%s\n", sym->name, *str ? str : "0");
                                 if (out_h)
                                         fprintf(out_h, "#define %s %s\n", sym->name, str);
                                 break;
                         }
                 }
 
-        next:
                 if (menu->list) {
                         menu = menu->list;
                         continue;