#include <ctype.h>
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <time.h>
ask_all,
ask_new,
ask_silent,
- dont_ask,
set_default,
set_yes,
set_mod,
static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n");
-static int return_value = 0;
-
static void strip(char *str)
{
char *p = str;
}
}
+static char *fgets_check_stream(char *s, int size, FILE *stream)
+{
+ char *ret = fgets(s, size, stream);
+
+ if (ret == NULL && feof(stream)) {
+ printf(_("aborted!\n\n"));
+ printf(_("Console input is closed. "));
+ printf(_("Run 'make oldconfig' to update configuration.\n\n"));
+ exit(1);
+ }
+
+ return ret;
+}
+
static void conf_askvalue(struct symbol *sym, const char *def)
{
enum symbol_type type = sym_get_type(sym);
check_stdin();
case ask_all:
fflush(stdout);
- fgets(line, 128, stdin);
- return;
- case dont_ask:
- if (!sym_has_value(sym)) {
- fprintf(stderr,"CONFIG_%s\n",sym->name);
- return_value++;
- }
+ fgets_check_stream(line, 128, stdin);
return;
case set_default:
printf("%s\n", def);
printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu));
def_sym = sym_get_choice_value(sym);
cnt = def = 0;
- line[0] = 0;
+ line[0] = '0';
+ line[1] = 0;
for (child = menu->list; child; child = child->next) {
if (!menu_is_visible(child))
continue;
printf("?");
printf("]: ");
switch (input_mode) {
- case dont_ask:
- cnt = def;
- printf("%d\n", cnt);
- break;
case ask_new:
case ask_silent:
if (!is_new) {
check_stdin();
case ask_all:
fflush(stdout);
- fgets(line, 128, stdin);
+ fgets_check_stream(line, 128, stdin);
strip(line);
if (line[0] == '?') {
printf("\n%s\n", menu->sym->help ?
if (!conf_cnt++)
printf(_("*\n* Restart config...\n*\n"));
rootEntry = menu_get_parent_menu(menu);
- if (input_mode == dont_ask)
- fprintf(stderr,"CONFIG_%s\n",sym->name);
- else
- conf(rootEntry);
+ conf(rootEntry);
}
}
case 'o':
input_mode = ask_new;
break;
- case 'b':
- input_mode = dont_ask;
- break;
case 's':
input_mode = ask_silent;
valid_stdin = isatty(0) && isatty(1) && isatty(2);
break;
case 'h':
case '?':
- fprintf(stderr, "See README for usage info\n");
+ printf("%s [-o|-s] config\n", av[0]);
exit(0);
}
}
}
case ask_all:
case ask_new:
- case dont_ask:
conf_read(NULL);
break;
case set_no:
do {
conf_cnt = 0;
check_conf(&rootmenu);
- } while ((conf_cnt) && (input_mode != dont_ask));
+ } while (conf_cnt);
if (conf_write(NULL)) {
fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
return 1;
}
- return return_value;
+ return 0;
}