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 7c2b7a7d0aff2d56dccd34360f17a9ded6756897..ba416355ac2e61118e01eb072f4653f99b28574f 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,11
@@
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");
}
static int conf_askvalue(struct symbol *sym, const char *def)
}
static int conf_askvalue(struct symbol *sym, const char *def)
@@
-104,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);
@@
-190,9
+184,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
+286,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
+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);
@@
-605,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);
@@
-668,12
+654,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");
-}