dnsmasq: full: disable ipset support by default
[openwrt/staging/mkresin.git] / scripts / config / conf.c
index 1f94816cf209e357ef3347a0bce8158798d978bb..978abebe654555ecf1ad4ef7cc81e75f75f963f7 100644 (file)
@@ -1,28 +1,27 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
- * Released under the terms of the GNU GPL v2.0.
  */
 
-#include <locale.h>
 #include <ctype.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 #include <getopt.h>
-#include <sys/stat.h>
 #include <sys/time.h>
+#include <errno.h>
 
 #include "lkc.h"
 
 static void conf(struct menu *menu);
 static void check_conf(struct menu *menu);
-static void xfgets(char *str, int size, FILE *in);
 
 enum input_mode {
        oldaskconfig,
-       silentoldconfig,
+       syncconfig,
        oldconfig,
        allnoconfig,
        allyesconfig,
@@ -32,15 +31,19 @@ enum input_mode {
        defconfig,
        savedefconfig,
        listnewconfig,
+       helpnewconfig,
        olddefconfig,
-} input_mode = oldaskconfig;
-
+       yes2modconfig,
+       mod2yesconfig,
+       fatalrecursive,
+};
+static enum input_mode input_mode = oldaskconfig;
+static int input_mode_opt;
 static int indent = 1;
 static int tty_stdio;
-static int valid_stdin = 1;
 static int sync_kconfig;
 static int conf_cnt;
-static char line[128];
+static char line[PATH_MAX];
 static struct menu *rootEntry;
 
 static void print_help(struct menu *menu)
@@ -70,27 +73,260 @@ static void strip(char *str)
                *p-- = 0;
 }
 
-static void check_stdin(void)
+/* Helper function to facilitate fgets() by Jean Sacren. */
+static void xfgets(char *str, int size, FILE *in)
 {
-       if (!valid_stdin) {
-               printf(_("aborted!\n\n"));
-               printf(_("Console input/output is redirected. "));
-               printf(_("Run 'make oldconfig' to update configuration.\n\n"));
-               exit(1);
+       if (!fgets(str, size, in))
+               fprintf(stderr, "\nError in reading or end of file.\n");
+
+       if (!tty_stdio)
+               printf("%s", str);
+}
+
+static void set_randconfig_seed(void)
+{
+       unsigned int seed;
+       char *env;
+       bool seed_set = false;
+
+       env = getenv("KCONFIG_SEED");
+       if (env && *env) {
+               char *endp;
+
+               seed = strtol(env, &endp, 0);
+               if (*endp == '\0')
+                       seed_set = true;
        }
+
+       if (!seed_set) {
+               struct timeval now;
+
+               /*
+                * Use microseconds derived seed, compensate for systems where it may
+                * be zero.
+                */
+               gettimeofday(&now, NULL);
+               seed = (now.tv_sec + 1) * (now.tv_usec + 1);
+       }
+
+       printf("KCONFIG_SEED=0x%X\n", seed);
+       srand(seed);
 }
 
-static int conf_askvalue(struct symbol *sym, const char *def)
+static bool randomize_choice_values(struct symbol *csym)
+{
+       struct property *prop;
+       struct symbol *sym;
+       struct expr *e;
+       int cnt, def;
+
+       /*
+        * If choice is mod then we may have more items selected
+        * and if no then no-one.
+        * In both cases stop.
+        */
+       if (csym->curr.tri != yes)
+               return false;
+
+       prop = sym_get_choice_prop(csym);
+
+       /* count entries in choice block */
+       cnt = 0;
+       expr_list_for_each_sym(prop->expr, e, sym)
+               cnt++;
+
+       /*
+        * find a random value and set it to yes,
+        * set the rest to no so we have only one set
+        */
+       def = rand() % cnt;
+
+       cnt = 0;
+       expr_list_for_each_sym(prop->expr, e, sym) {
+               if (def == cnt++) {
+                       sym->def[S_DEF_USER].tri = yes;
+                       csym->def[S_DEF_USER].val = sym;
+               } else {
+                       sym->def[S_DEF_USER].tri = no;
+               }
+               sym->flags |= SYMBOL_DEF_USER;
+               /* clear VALID to get value calculated */
+               sym->flags &= ~SYMBOL_VALID;
+       }
+       csym->flags |= SYMBOL_DEF_USER;
+       /* clear VALID to get value calculated */
+       csym->flags &= ~SYMBOL_VALID;
+
+       return true;
+}
+
+enum conf_def_mode {
+       def_default,
+       def_yes,
+       def_mod,
+       def_y2m,
+       def_m2y,
+       def_no,
+       def_random
+};
+
+static bool conf_set_all_new_symbols(enum conf_def_mode mode)
+{
+       struct symbol *sym, *csym;
+       int i, cnt;
+       /*
+        * can't go as the default in switch-case below, otherwise gcc whines
+        * about -Wmaybe-uninitialized
+        */
+       int pby = 50; /* probability of bool     = y */
+       int pty = 33; /* probability of tristate = y */
+       int ptm = 33; /* probability of tristate = m */
+       bool has_changed = false;
+
+       if (mode == def_random) {
+               int n, p[3];
+               char *env = getenv("KCONFIG_PROBABILITY");
+
+               n = 0;
+               while (env && *env) {
+                       char *endp;
+                       int tmp = strtol(env, &endp, 10);
+
+                       if (tmp >= 0 && tmp <= 100) {
+                               p[n++] = tmp;
+                       } else {
+                               errno = ERANGE;
+                               perror("KCONFIG_PROBABILITY");
+                               exit(1);
+                       }
+                       env = (*endp == ':') ? endp + 1 : endp;
+                       if (n >= 3)
+                               break;
+               }
+               switch (n) {
+               case 1:
+                       pby = p[0];
+                       ptm = pby / 2;
+                       pty = pby - ptm;
+                       break;
+               case 2:
+                       pty = p[0];
+                       ptm = p[1];
+                       pby = pty + ptm;
+                       break;
+               case 3:
+                       pby = p[0];
+                       pty = p[1];
+                       ptm = p[2];
+                       break;
+               }
+
+               if (pty + ptm > 100) {
+                       errno = ERANGE;
+                       perror("KCONFIG_PROBABILITY");
+                       exit(1);
+               }
+       }
+
+       sym_clear_all_valid();
+
+       for_all_symbols(i, sym) {
+               if (sym_has_value(sym) || sym->flags & SYMBOL_VALID)
+                       continue;
+               switch (sym_get_type(sym)) {
+               case S_BOOLEAN:
+               case S_TRISTATE:
+                       has_changed = true;
+                       switch (mode) {
+                       case def_yes:
+                               sym->def[S_DEF_USER].tri = yes;
+                               break;
+                       case def_mod:
+                               sym->def[S_DEF_USER].tri = mod;
+                               break;
+                       case def_no:
+                               sym->def[S_DEF_USER].tri = no;
+                               break;
+                       case def_random:
+                               sym->def[S_DEF_USER].tri = no;
+                               cnt = rand() % 100;
+                               if (sym->type == S_TRISTATE) {
+                                       if (cnt < pty)
+                                               sym->def[S_DEF_USER].tri = yes;
+                                       else if (cnt < pty + ptm)
+                                               sym->def[S_DEF_USER].tri = mod;
+                               } else if (cnt < pby)
+                                       sym->def[S_DEF_USER].tri = yes;
+                               break;
+                       default:
+                               continue;
+                       }
+                       if (!(sym_is_choice(sym) && mode == def_random))
+                               sym->flags |= SYMBOL_DEF_USER;
+                       break;
+               default:
+                       break;
+               }
+
+       }
+
+       /*
+        * We have different type of choice blocks.
+        * If curr.tri equals to mod then we can select several
+        * choice symbols in one block.
+        * In this case we do nothing.
+        * If curr.tri equals yes then only one symbol can be
+        * selected in a choice block and we set it to yes,
+        * and the rest to no.
+        */
+       if (mode != def_random) {
+               for_all_symbols(i, csym) {
+                       if ((sym_is_choice(csym) && !sym_has_value(csym)) ||
+                           sym_is_choice_value(csym))
+                               csym->flags |= SYMBOL_NEED_SET_CHOICE_VALUES;
+               }
+       }
+
+       for_all_symbols(i, csym) {
+               if (sym_has_value(csym) || !sym_is_choice(csym))
+                       continue;
+
+               sym_calc_value(csym);
+               if (mode == def_random)
+                       has_changed |= randomize_choice_values(csym);
+               else {
+                       set_all_choice_values(csym);
+                       has_changed = true;
+               }
+       }
+
+       return has_changed;
+}
+
+static void conf_rewrite_mod_or_yes(enum conf_def_mode mode)
 {
-       enum symbol_type type = sym_get_type(sym);
+       struct symbol *sym;
+       int i;
+       tristate old_val = (mode == def_y2m) ? yes : mod;
+       tristate new_val = (mode == def_y2m) ? mod : yes;
+
+       for_all_symbols(i, sym) {
+               if (sym_get_type(sym) == S_TRISTATE &&
+                   sym->def[S_DEF_USER].tri == old_val)
+                       sym->def[S_DEF_USER].tri = new_val;
+       }
+       sym_clear_all_valid();
+}
 
+static int conf_askvalue(struct symbol *sym, const char *def)
+{
        if (!sym_has_value(sym))
-               printf(_("(NEW) "));
+               printf("(NEW) ");
 
        line[0] = '\n';
        line[1] = 0;
 
-       if (!sym_is_changable(sym)) {
+       if (!sym_is_changeable(sym)) {
                printf("%s\n", def);
                line[0] = '\n';
                line[1] = 0;
@@ -99,33 +335,18 @@ static int conf_askvalue(struct symbol *sym, const char *def)
 
        switch (input_mode) {
        case oldconfig:
-       case silentoldconfig:
+       case syncconfig:
                if (sym_has_value(sym)) {
                        printf("%s\n", def);
                        return 0;
                }
-               check_stdin();
                /* fall through */
-       case oldaskconfig:
-               fflush(stdout);
-               xfgets(line, 128, stdin);
-               if (!tty_stdio)
-                       printf("\n");
-               return 1;
        default:
+               fflush(stdout);
+               xfgets(line, sizeof(line), stdin);
                break;
        }
 
-       switch (type) {
-       case S_INT:
-       case S_HEX:
-       case S_STRING:
-               printf("%s\n", def);
-               return 1;
-       default:
-               ;
-       }
-       printf("%s", line);
        return 1;
 }
 
@@ -135,10 +356,10 @@ static int conf_string(struct menu *menu)
        const char *def;
 
        while (1) {
-               printf("%*s%s ", indent - 1, "", _(menu->prompt->text));
+               printf("%*s%s ", indent - 1, "", menu->prompt->text);
                printf("(%s) ", sym->name);
                def = sym_get_string_value(sym);
-               if (sym_get_string_value(sym))
+               if (def)
                        printf("[%s] ", def);
                if (!conf_askvalue(sym, def))
                        return 0;
@@ -168,7 +389,7 @@ static int conf_sym(struct menu *menu)
        tristate oldval, newval;
 
        while (1) {
-               printf("%*s%s ", indent - 1, "", _(menu->prompt->text));
+               printf("%*s%s ", indent - 1, "", menu->prompt->text);
                if (sym->name)
                        printf("(%s) ", sym->name);
                putchar('[');
@@ -190,9 +411,7 @@ static int conf_sym(struct menu *menu)
                        printf("/m");
                if (oldval != yes && sym_tristate_within_range(sym, yes))
                        printf("/y");
-               if (menu_has_help(menu))
-                       printf("/?");
-               printf("] ");
+               printf("/?] ");
                if (!conf_askvalue(sym, sym_get_string_value(sym)))
                        return 0;
                strip(line);
@@ -239,7 +458,7 @@ static int conf_choice(struct menu *menu)
 
        sym = menu->sym;
        is_new = !sym_has_value(sym);
-       if (sym_is_changable(sym)) {
+       if (sym_is_changeable(sym)) {
                conf_sym(menu);
                sym_calc_value(sym);
                switch (sym_get_tristate_value(sym)) {
@@ -255,7 +474,7 @@ static int conf_choice(struct menu *menu)
                case no:
                        return 1;
                case mod:
-                       printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu)));
+                       printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu));
                        return 0;
                case yes:
                        break;
@@ -265,7 +484,7 @@ static int conf_choice(struct menu *menu)
        while (1) {
                int cnt, def;
 
-               printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu)));
+               printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu));
                def_sym = sym_get_choice_value(sym);
                cnt = def = 0;
                line[0] = 0;
@@ -273,7 +492,7 @@ static int conf_choice(struct menu *menu)
                        if (!menu_is_visible(child))
                                continue;
                        if (!child->sym) {
-                               printf("%*c %s\n", indent, '*', _(menu_get_prompt(child)));
+                               printf("%*c %s\n", indent, '*', menu_get_prompt(child));
                                continue;
                        }
                        cnt++;
@@ -282,35 +501,31 @@ static int conf_choice(struct menu *menu)
                                printf("%*c", indent, '>');
                        } else
                                printf("%*c", indent, ' ');
-                       printf(" %d. %s", cnt, _(menu_get_prompt(child)));
+                       printf(" %d. %s", cnt, menu_get_prompt(child));
                        if (child->sym->name)
                                printf(" (%s)", child->sym->name);
                        if (!sym_has_value(child->sym))
-                               printf(_(" (NEW)"));
+                               printf(" (NEW)");
                        printf("\n");
                }
-               printf(_("%*schoice"), indent - 1, "");
+               printf("%*schoice", indent - 1, "");
                if (cnt == 1) {
                        printf("[1]: 1\n");
                        goto conf_childs;
                }
-               printf("[1-%d", cnt);
-               if (menu_has_help(menu))
-                       printf("?");
-               printf("]: ");
+               printf("[1-%d?]: ", cnt);
                switch (input_mode) {
                case oldconfig:
-               case silentoldconfig:
+               case syncconfig:
                        if (!is_new) {
                                cnt = def;
                                printf("%d\n", cnt);
                                break;
                        }
-                       check_stdin();
                        /* fall through */
                case oldaskconfig:
                        fflush(stdout);
-                       xfgets(line, 128, stdin);
+                       xfgets(line, sizeof(line), stdin);
                        strip(line);
                        if (line[0] == '?') {
                                print_help(menu);
@@ -366,10 +581,11 @@ static void conf(struct menu *menu)
 
                switch (prop->type) {
                case P_MENU:
-                       if ((input_mode == silentoldconfig ||
-                            input_mode == listnewconfig ||
-                            input_mode == olddefconfig) &&
-                           rootEntry != menu) {
+                       /*
+                        * Except in oldaskconfig mode, we show only menus that
+                        * contain new symbols.
+                        */
+                       if (input_mode != oldaskconfig && rootEntry != menu) {
                                check_conf(menu);
                                return;
                        }
@@ -379,7 +595,7 @@ static void conf(struct menu *menu)
                        if (prompt)
                                printf("%*c\n%*c %s\n%*c\n",
                                        indent, '*',
-                                       indent, '*', _(prompt),
+                                       indent, '*', prompt,
                                        indent, '*');
                default:
                        ;
@@ -425,19 +641,37 @@ static void check_conf(struct menu *menu)
                return;
 
        sym = menu->sym;
-       if (sym && !sym_has_value(sym)) {
-               if (sym_is_changable(sym) ||
-                   (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
-                       if (input_mode == listnewconfig) {
-                               if (sym->name && !sym_is_choice_value(sym)) {
-                                       printf("%s%s\n", CONFIG_, sym->name);
+       if (sym && !sym_has_value(sym) &&
+           (sym_is_changeable(sym) ||
+            (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes))) {
+
+               switch (input_mode) {
+               case listnewconfig:
+                       if (sym->name) {
+                               const char *str;
+
+                               if (sym->type == S_STRING) {
+                                       str = sym_get_string_value(sym);
+                                       str = sym_escape_string_value(str);
+                                       printf("%s%s=%s\n", CONFIG_, sym->name, str);
+                                       free((void *)str);
+                               } else {
+                                       str = sym_get_string_value(sym);
+                                       printf("%s%s=%s\n", CONFIG_, sym->name, str);
                                }
-                       } else if (input_mode != olddefconfig) {
-                               if (!conf_cnt++)
-                                       printf(_("*\n* Restart config...\n*\n"));
-                               rootEntry = menu_get_parent_menu(menu);
-                               conf(rootEntry);
                        }
+                       break;
+               case helpnewconfig:
+                       printf("-----\n");
+                       print_help(menu);
+                       printf("-----\n");
+                       break;
+               default:
+                       if (!conf_cnt++)
+                               printf("*\n* Restart config...\n*\n");
+                       rootEntry = menu_get_parent_menu(menu);
+                       conf(rootEntry);
+                       break;
                }
        }
 
@@ -445,39 +679,45 @@ static void check_conf(struct menu *menu)
                check_conf(child);
 }
 
-static struct option long_opts[] = {
-       {"oldaskconfig",    no_argument,       NULL, oldaskconfig},
-       {"oldconfig",       no_argument,       NULL, oldconfig},
-       {"silentoldconfig", no_argument,       NULL, silentoldconfig},
-       {"defconfig",       optional_argument, NULL, defconfig},
-       {"savedefconfig",   required_argument, NULL, savedefconfig},
-       {"allnoconfig",     no_argument,       NULL, allnoconfig},
-       {"allyesconfig",    no_argument,       NULL, allyesconfig},
-       {"allmodconfig",    no_argument,       NULL, allmodconfig},
-       {"alldefconfig",    no_argument,       NULL, alldefconfig},
-       {"randconfig",      no_argument,       NULL, randconfig},
-       {"listnewconfig",   no_argument,       NULL, listnewconfig},
-       {"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},
+static const struct option long_opts[] = {
+       {"help",          no_argument,       NULL,            'h'},
+       {"silent",        no_argument,       NULL,            's'},
+       {"oldaskconfig",  no_argument,       &input_mode_opt, oldaskconfig},
+       {"oldconfig",     no_argument,       &input_mode_opt, oldconfig},
+       {"syncconfig",    no_argument,       &input_mode_opt, syncconfig},
+       {"defconfig",     required_argument, &input_mode_opt, defconfig},
+       {"savedefconfig", required_argument, &input_mode_opt, savedefconfig},
+       {"allnoconfig",   no_argument,       &input_mode_opt, allnoconfig},
+       {"allyesconfig",  no_argument,       &input_mode_opt, allyesconfig},
+       {"allmodconfig",  no_argument,       &input_mode_opt, allmodconfig},
+       {"alldefconfig",  no_argument,       &input_mode_opt, alldefconfig},
+       {"randconfig",    no_argument,       &input_mode_opt, randconfig},
+       {"listnewconfig", no_argument,       &input_mode_opt, listnewconfig},
+       {"helpnewconfig", no_argument,       &input_mode_opt, helpnewconfig},
+       {"olddefconfig",  no_argument,       &input_mode_opt, olddefconfig},
+       {"yes2modconfig", no_argument,       &input_mode_opt, yes2modconfig},
+       {"mod2yesconfig", no_argument,       &input_mode_opt, mod2yesconfig},
+       {"fatalrecursive",no_argument,       NULL, fatalrecursive},
        {NULL, 0, NULL, 0}
 };
 
 static void conf_usage(const char *progname)
 {
-
-       printf("Usage: %s [option] <kconfig-file>\n", progname);
-       printf("[option] is _one_ of the following:\n");
+       printf("Usage: %s [options] <kconfig-file>\n", progname);
+       printf("\n");
+       printf("Generic options:\n");
+       printf("  -h, --help              Print this message and exit.\n");
+       printf("  -s, --silent            Do not print log.\n");
+       printf("      --fatalrecursive    Treat recursive depenendencies as a fatal error\n");
+       printf("\n");
+       printf("Mode options:\n");
        printf("  --listnewconfig         List new options\n");
+       printf("  --helpnewconfig         List new options and help text\n");
        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("  --olddefconfig          Same as silentoldconfig but sets new symbols to their default value\n");
-       printf("  --oldnoconfig           An alias of olddefconfig\n");
+       printf("  --syncconfig            Similar to oldconfig but generates configuration in\n"
+              "                          include/{generated/,config/}\n");
+       printf("  --olddefconfig          Same as oldconfig but sets new symbols to their default value\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");
@@ -485,6 +725,9 @@ static void conf_usage(const char *progname)
        printf("  --allmodconfig          New config where all options are answered with mod\n");
        printf("  --alldefconfig          New config with all symbols set to default\n");
        printf("  --randconfig            New config with random answer to all options\n");
+       printf("  --yes2modconfig         Change answers from yes to mod if possible\n");
+       printf("  --mod2yesconfig         Change answers from mod to yes if possible\n");
+       printf("  (If none of the above is given, --oldaskconfig is the default)\n");
 }
 
 int main(int ac, char **av)
@@ -492,99 +735,83 @@ int main(int ac, char **av)
        const char *progname = av[0];
        int opt;
        const char *name, *defconfig_file = NULL /* gcc uninit */;
-       struct stat tmpstat;
        const char *input_file = NULL, *output_file = NULL;
+       int no_conf_write = 0;
 
-       setlocale(LC_ALL, "");
-       bindtextdomain(PACKAGE, LOCALEDIR);
-       textdomain(PACKAGE);
+       tty_stdio = isatty(0) && isatty(1);
 
-       tty_stdio = isatty(0) && isatty(1) && isatty(2);
-
-       while ((opt = getopt_long(ac, av, "r:w:", long_opts, NULL)) != -1) {
-               input_mode = (enum input_mode)opt;
+       while ((opt = getopt_long(ac, av, "hr:sw:", long_opts, NULL)) != -1) {
                switch (opt) {
-               case silentoldconfig:
-                       sync_kconfig = 1;
-                       break;
-               case defconfig:
-               case savedefconfig:
-                       defconfig_file = optarg;
-                       break;
-               case randconfig:
-               {
-                       struct timeval now;
-                       unsigned int seed;
-
-                       /*
-                        * Use microseconds derived seed,
-                        * compensate for systems where it may be zero
-                        */
-                       gettimeofday(&now, NULL);
-
-                       seed = (unsigned int)((now.tv_sec + 1) * (now.tv_usec + 1));
-                       srand(seed);
+               case 'h':
+                       conf_usage(progname);
+                       exit(1);
                        break;
-               }
-               case oldaskconfig:
-               case oldconfig:
-               case allnoconfig:
-               case allyesconfig:
-               case allmodconfig:
-               case alldefconfig:
-               case listnewconfig:
-               case olddefconfig:
+               case 's':
+                       conf_set_message_callback(NULL);
                        break;
+               case fatalrecursive:
+                       recursive_is_error = 1;
+                       continue;
                case 'r':
                        input_file = optarg;
                        break;
                case 'w':
                        output_file = optarg;
                        break;
-               case '?':
-                       conf_usage(progname);
-                       exit(1);
+               case 0:
+                       input_mode = input_mode_opt;
+                       switch (input_mode) {
+                       case syncconfig:
+                               /*
+                                * syncconfig is invoked during the build stage.
+                                * Suppress distracting
+                                *   "configuration written to ..."
+                                */
+                               conf_set_message_callback(NULL);
+                               sync_kconfig = 1;
+                               break;
+                       case defconfig:
+                       case savedefconfig:
+                               defconfig_file = optarg;
+                               break;
+                       case randconfig:
+                               set_randconfig_seed();
+                               break;
+                       default:
+                               break;
+                       }
+               default:
                        break;
                }
        }
        if (ac == optind) {
-               printf(_("%s: Kconfig file missing\n"), av[0]);
+               fprintf(stderr, "%s: Kconfig file missing\n", av[0]);
                conf_usage(progname);
                exit(1);
        }
-       name = av[optind];
-       conf_parse(name);
+       conf_parse(av[optind]);
        //zconfdump(stdout);
-       if (sync_kconfig) {
-               name = conf_get_configname();
-               if (stat(name, &tmpstat)) {
-                       fprintf(stderr, _("***\n"
-                               "*** Configuration file \"%s\" not found!\n"
-                               "***\n"
-                               "*** Please run some configurator (e.g. \"make oldconfig\" or\n"
-                               "*** \"make menuconfig\" or \"make xconfig\").\n"
-                               "***\n"), name);
-                       exit(1);
-               }
-       }
 
        switch (input_mode) {
        case defconfig:
-               if (!defconfig_file)
-                       defconfig_file = conf_get_default_confname();
                if (conf_read(defconfig_file)) {
-                       printf(_("***\n"
-                               "*** Can't find default configuration \"%s\"!\n"
-                               "***\n"), defconfig_file);
+                       fprintf(stderr,
+                               "***\n"
+                                 "*** Can't find default configuration \"%s\"!\n"
+                                 "***\n",
+                               defconfig_file);
                        exit(1);
                }
                break;
        case savedefconfig:
-       case silentoldconfig:
+       case syncconfig:
        case oldaskconfig:
        case oldconfig:
        case listnewconfig:
+       case helpnewconfig:
        case olddefconfig:
+       case yes2modconfig:
+       case mod2yesconfig:
        case allnoconfig:
        case allyesconfig:
        case allmodconfig:
@@ -597,15 +824,15 @@ int main(int ac, char **av)
        }
 
        if (sync_kconfig) {
-               if (conf_get_changed()) {
-                       name = getenv("KCONFIG_NOSILENTUPDATE");
-                       if (name && *name) {
+               name = getenv("KCONFIG_NOSILENTUPDATE");
+               if (name && *name) {
+                       if (conf_get_changed()) {
                                fprintf(stderr,
-                                       _("\n*** The configuration requires explicit update.\n\n"));
+                                       "\n*** The configuration requires explicit update.\n\n");
                                return 1;
                        }
+                       no_conf_write = 1;
                }
-               valid_stdin = tty_stdio;
        }
 
        switch (input_mode) {
@@ -622,65 +849,67 @@ int main(int ac, char **av)
                conf_set_all_new_symbols(def_default);
                break;
        case randconfig:
-               conf_set_all_new_symbols(def_random);
+               /* Really nothing to do in this loop */
+               while (conf_set_all_new_symbols(def_random)) ;
                break;
        case defconfig:
                conf_set_all_new_symbols(def_default);
                break;
        case savedefconfig:
                break;
+       case yes2modconfig:
+               conf_rewrite_mod_or_yes(def_y2m);
+               break;
+       case mod2yesconfig:
+               conf_rewrite_mod_or_yes(def_m2y);
+               break;
        case oldaskconfig:
                rootEntry = &rootmenu;
                conf(&rootmenu);
-               input_mode = silentoldconfig;
+               input_mode = oldconfig;
                /* fall through */
        case oldconfig:
        case listnewconfig:
-       case olddefconfig:
-       case silentoldconfig:
+       case helpnewconfig:
+       case syncconfig:
                /* Update until a loop caused no more changes */
                do {
                        conf_cnt = 0;
                        check_conf(&rootmenu);
-               } while (conf_cnt &&
-                        (input_mode != listnewconfig &&
-                         input_mode != olddefconfig));
+               } while (conf_cnt);
+               break;
+       case olddefconfig:
+       default:
                break;
        }
 
-       if (sync_kconfig) {
-               /* silentoldconfig is used during the build so we shall update autoconf.
-                * All other commands are only used to generate a config.
-                */
-               if ((output_file || conf_get_changed()) &&
-                   conf_write(output_file)) {
-                       fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
-                       exit(1);
-               }
-               if (conf_write_autoconf()) {
-                       fprintf(stderr, _("\n*** Error during update of the configuration.\n\n"));
-                       return 1;
-               }
-       } else if (input_mode == savedefconfig) {
+       if (input_mode == savedefconfig) {
                if (conf_write_defconfig(defconfig_file)) {
-                       fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"),
-                               defconfig_file);
+                       fprintf(stderr, "n*** Error while saving defconfig to: %s\n\n",
+                               defconfig_file);
                        return 1;
                }
-       } else if (input_mode != listnewconfig) {
-               if (conf_write(output_file)) {
-                       fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
+       } else if (input_mode != listnewconfig && input_mode != helpnewconfig) {
+               if ((output_file || !no_conf_write) &&
+                   conf_write(output_file)) {
+                       fprintf(stderr, "\n*** Error during writing of the configuration.\n\n");
                        exit(1);
                }
+
+               /*
+                * Create auto.conf if it does not exist.
+                * This prevents GNU Make 4.1 or older from emitting
+                * "include/config/auto.conf: No such file or directory"
+                * in the top-level Makefile
+                *
+                * syncconfig always creates or updates auto.conf because it is
+                * used during the build.
+                */
+               if (conf_write_autoconf(sync_kconfig) && sync_kconfig) {
+                       fprintf(stderr,
+                               "\n*** Error during sync of the configuration.\n\n");
+                       return 1;
+               }
        }
        return 0;
 }
-
-/*
- * Helper function to facilitate fgets() by Jean Sacren.
- */
-void xfgets(char *str, int size, FILE *in)
-{
-       if (fgets(str, size, in) == NULL)
-               fprintf(stderr, "\nError in reading or end of file.\n");
-}