projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: hide irrelevant sub-menus for oldconfig
[carl9170fw.git]
/
config
/
conf.c
diff --git
a/config/conf.c
b/config/conf.c
index 7c2b7a7d0aff2d56dccd34360f17a9ded6756897..c4bc255a95d5232b0249e63d99a529da2064ed9d 100644
(file)
--- a/
config/conf.c
+++ b/
config/conf.c
@@
-20,7
+20,6
@@
static void conf(struct menu *menu);
static void check_conf(struct menu *menu);
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,
enum input_mode {
oldaskconfig,
@@
-39,7
+38,6
@@
static enum input_mode input_mode = oldaskconfig;
static int indent = 1;
static int tty_stdio;
static int indent = 1;
static int tty_stdio;
-static int valid_stdin = 1;
static int conf_cnt;
static char line[PATH_MAX];
static struct menu *rootEntry;
static int conf_cnt;
static char line[PATH_MAX];
static struct menu *rootEntry;
@@
-71,14
+69,14
@@
static void strip(char *str)
*p-- = 0;
}
*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 config' 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 int conf_askvalue(struct symbol *sym, const char *def)
}
static int conf_askvalue(struct symbol *sym, const char *def)
@@
-104,13
+102,10
@@
static int conf_askvalue(struct symbol *sym, const char *def)
printf("%s\n", def);
return 0;
}
printf("%s\n", def);
return 0;
}
- check_stdin();
/* fall through */
case oldaskconfig:
fflush(stdout);
xfgets(line, sizeof(line), stdin);
/* fall through */
case oldaskconfig:
fflush(stdout);
xfgets(line, sizeof(line), stdin);
- if (!tty_stdio)
- printf("\n");
return 1;
default:
break;
return 1;
default:
break;
@@
-190,9
+185,7
@@
static int conf_sym(struct menu *menu)
printf("/m");
if (oldval != yes && sym_tristate_within_range(sym, yes))
printf("/y");
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);
if (!conf_askvalue(sym, sym_get_string_value(sym)))
return 0;
strip(line);
@@
-294,10
+287,7
@@
static int conf_choice(struct menu *menu)
printf("[1]: 1\n");
goto conf_childs;
}
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:
if (!is_new) {
switch (input_mode) {
case oldconfig:
if (!is_new) {
@@
-305,7
+295,6
@@
static int conf_choice(struct menu *menu)
printf("%d\n", cnt);
break;
}
printf("%d\n", cnt);
break;
}
- check_stdin();
/* fall through */
case oldaskconfig:
fflush(stdout);
/* fall through */
case oldaskconfig:
fflush(stdout);
@@
-365,9
+354,11
@@
static void conf(struct menu *menu)
switch (prop->type) {
case P_MENU:
switch (prop->type) {
case P_MENU:
- if ((input_mode == listnewconfig ||
- input_mode == oldnoconfig) &&
- rootEntry != menu) {
+ /*
+ * Except in oldaskconfig mode, we show only menus that
+ * contain new symbols.
+ */
+ if (input_mode != oldaskconfig && rootEntry != menu) {
check_conf(menu);
return;
}
check_conf(menu);
return;
}
@@
-430,7
+421,7
@@
static void check_conf(struct menu *menu)
if (sym->name && !sym_is_choice_value(sym)) {
printf("%s%s\n", CONFIG_, sym->name);
}
if (sym->name && !sym_is_choice_value(sym)) {
printf("%s%s\n", CONFIG_, sym->name);
}
- } else
if (input_mode != oldnoconfig)
{
+ } else {
if (!conf_cnt++)
printf(_("*\n* Restart config...\n*\n"));
rootEntry = menu_get_parent_menu(menu);
if (!conf_cnt++)
printf(_("*\n* Restart config...\n*\n"));
rootEntry = menu_get_parent_menu(menu);
@@
-488,7
+479,7
@@
int main(int ac, char **av)
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
- tty_stdio = isatty(0) && isatty(1)
&& isatty(2)
;
+ tty_stdio = isatty(0) && isatty(1);
while ((opt = getopt_long(ac, av, "s", long_opts, NULL)) != -1) {
if (opt == 's') {
while ((opt = getopt_long(ac, av, "s", long_opts, NULL)) != -1) {
if (opt == 's') {
@@
-542,7
+533,7
@@
int main(int ac, char **av)
}
}
if (ac == optind) {
}
}
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);
}
conf_usage(progname);
exit(1);
}
@@
-555,9
+546,11
@@
int main(int ac, char **av)
if (!defconfig_file)
defconfig_file = conf_get_default_confname();
if (conf_read(defconfig_file)) {
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;
exit(1);
}
break;
@@
-605,8
+598,6
@@
int main(int ac, char **av)
break;
}
break;
}
- valid_stdin = tty_stdio;
-
switch (input_mode) {
case allnoconfig:
conf_set_all_new_symbols(def_no);
switch (input_mode) {
case allnoconfig:
conf_set_all_new_symbols(def_no);
@@
-641,9
+632,7
@@
int main(int ac, char **av)
do {
conf_cnt = 0;
check_conf(&rootmenu);
do {
conf_cnt = 0;
check_conf(&rootmenu);
- } while (conf_cnt &&
- (input_mode != listnewconfig &&
- input_mode != oldnoconfig));
+ } while (conf_cnt);
break;
}
break;
}
@@
-668,12
+657,3
@@
int main(int ac, char **av)
}
return 0;
}
}
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");
-}