projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: remove check_stdin()
[carl9170fw.git]
/
config
/
conf.c
diff --git
a/config/conf.c
b/config/conf.c
index 51a781ad06a8b7e612b7d10de0ea4f7d4d754c18..ba416355ac2e61118e01eb072f4653f99b28574f 100644
(file)
--- a/
config/conf.c
+++ b/
config/conf.c
@@
-38,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;
@@
-70,16
+69,6
@@
static void strip(char *str)
*p-- = 0;
}
*p-- = 0;
}
-static void check_stdin(void)
-{
- if (!valid_stdin) {
- printf(_("aborted!\n\n"));
- printf(_("Console input/output is redirected. "));
- printf(_("Run 'make config' to update configuration.\n\n"));
- exit(1);
- }
-}
-
/* Helper function to facilitate fgets() by Jean Sacren. */
static void xfgets(char *str, int size, FILE *in)
{
/* Helper function to facilitate fgets() by Jean Sacren. */
static void xfgets(char *str, int size, FILE *in)
{
@@
-110,7
+99,6
@@
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);
/* fall through */
case oldaskconfig:
fflush(stdout);
@@
-306,7
+294,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);
@@
-606,8
+593,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);