kconfig: replace 'oldnoconfig' with 'olddefconfig', and keep the old name as an alias

As 67d34a6a391369269a2e5dba8a5f42cc4cd50231 said, 'oldnoconfig' doesn't
set new symbols to 'n', but instead sets it to their default values.

So, this patch replaces 'oldnoconfig' with 'olddefconfig', stop making
people confused, and keep the old name 'oldnoconfig' as an alias,
because people already are dependent on its behavior with the
counter-intuitive name.

Signed-off-by: Adam Lee <adam8157@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>

2 files changed, 25 insertions, 12 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 77d53999ffb9..3091794e9354 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -76,11 +76,17 @@ PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
 allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf
         $< --$@ $(Kconfig)
 
-PHONY += listnewconfig oldnoconfig savedefconfig defconfig
+PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig
 
-listnewconfig oldnoconfig: $(obj)/conf
+listnewconfig olddefconfig: $(obj)/conf
         $< --$@ $(Kconfig)
 
+# oldnoconfig is an alias of olddefconfig, because people already are dependent
+# on its behavior(sets new symbols to their default value but not 'n') with the
+# counter-intuitive name.
+oldnoconfig: $(obj)/conf
+        $< --olddefconfig $(Kconfig)
+
 savedefconfig: $(obj)/conf
         $< --$@=defconfig $(Kconfig)
 
@@ -114,7 +120,7 @@ help:
         @echo  '  alldefconfig    - New config with all symbols set to default'
         @echo  '  randconfig      - New config with random answer to all options'
         @echo  '  listnewconfig   - List new options'
-        @echo  '  oldnoconfig     - Same as silentoldconfig but sets new symbols to their default value'
+        @echo  '  olddefconfig    - Same as silentoldconfig but sets new symbols to their default value'
 
 # lxdialog stuff
 check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 6875680a8db2..4da3b4adfad2 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -32,7 +32,7 @@ enum input_mode {
         defconfig,
         savedefconfig,
         listnewconfig,
-        oldnoconfig,
+        olddefconfig,
 } input_mode = oldaskconfig;
 
 static int indent = 1;
@@ -365,7 +365,7 @@ static void conf(struct menu *menu)
                 case P_MENU:
                         if ((input_mode == silentoldconfig ||
                              input_mode == listnewconfig ||
-                             input_mode == oldnoconfig) &&
+                             input_mode == olddefconfig) &&
                             rootEntry != menu) {
                                 check_conf(menu);
                                 return;
@@ -429,7 +429,7 @@ static void check_conf(struct menu *menu)
                                 if (sym->name && !sym_is_choice_value(sym)) {
                                         printf("%s%s\n", CONFIG_, sym->name);
                                 }
-                        } else if (input_mode != oldnoconfig) {
+                        } else if (input_mode != olddefconfig) {
                                 if (!conf_cnt++)
                                         printf(_("*\n* Restart config...\n*\n"));
                                 rootEntry = menu_get_parent_menu(menu);
@@ -454,7 +454,13 @@ static struct option long_opts[] = {
         {"alldefconfig",    no_argument,       NULL, alldefconfig},
         {"randconfig",      no_argument,       NULL, randconfig},
         {"listnewconfig",   no_argument,       NULL, listnewconfig},
-        {"oldnoconfig",     no_argument,       NULL, oldnoconfig},
+        {"olddefconfig",    no_argument,       NULL, olddefconfig},
+        /*
+         * oldnoconfig is an alias of olddefconfig, because people already
+         * are dependent on its behavior(sets new symbols to their default
+         * value but not 'n') with the counter-intuitive name.
+         */
+        {"oldnoconfig",     no_argument,       NULL, olddefconfig},
         {NULL, 0, NULL, 0}
 };
 
@@ -467,7 +473,8 @@ static void conf_usage(const char *progname)
         printf("  --oldaskconfig          Start a new configuration using a line-oriented program\n");
         printf("  --oldconfig             Update a configuration using a provided .config as base\n");
         printf("  --silentoldconfig       Same as oldconfig, but quietly, additionally update deps\n");
-        printf("  --oldnoconfig           Same as silentoldconfig but sets new symbols to their default value\n");
+        printf("  --olddefconfig          Same as silentoldconfig but sets new symbols to their default value\n");
+        printf("  --oldnoconfig           An alias of olddefconfig\n");
         printf("  --defconfig <file>      New config with default defined in <file>\n");
         printf("  --savedefconfig <file>  Save the minimal current configuration to <file>\n");
         printf("  --allnoconfig           New config where all options are answered with no\n");
@@ -520,7 +527,7 @@ int main(int ac, char **av)
                 case allmodconfig:
                 case alldefconfig:
                 case listnewconfig:
-                case oldnoconfig:
+                case olddefconfig:
                         break;
                 case '?':
                         conf_usage(progname);
@@ -565,7 +572,7 @@ int main(int ac, char **av)
         case oldaskconfig:
         case oldconfig:
         case listnewconfig:
-        case oldnoconfig:
+        case olddefconfig:
                 conf_read(NULL);
                 break;
         case allnoconfig:
@@ -645,7 +652,7 @@ int main(int ac, char **av)
                 /* fall through */
         case oldconfig:
         case listnewconfig:
-        case oldnoconfig:
+        case olddefconfig:
         case silentoldconfig:
                 /* Update until a loop caused no more changes */
                 do {
@@ -653,7 +660,7 @@ int main(int ac, char **av)
                         check_conf(&rootmenu);
                 } while (conf_cnt &&
                          (input_mode != listnewconfig &&
-                          input_mode != oldnoconfig));
+                          input_mode != olddefconfig));
                 break;
         }