projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: add xrealloc() helper
[carl9170fw.git]
/
config
/
conf.c
diff --git
a/config/conf.c
b/config/conf.c
index 6b6cba52a453455e2be70e3b16cf86cc6e88ca74..392cefd68daf03a68be5747733c51118c623e72b 100644
(file)
--- a/
config/conf.c
+++ b/
config/conf.c
@@
-5,6
+5,7
@@
#include <locale.h>
#include <ctype.h>
#include <locale.h>
#include <ctype.h>
+#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-19,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,
@@
-33,13
+33,13
@@
enum input_mode {
savedefconfig,
listnewconfig,
oldnoconfig,
savedefconfig,
listnewconfig,
oldnoconfig,
-} input_mode = oldaskconfig;
+};
+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 int conf_cnt;
-static char line[
128
];
+static char line[
PATH_MAX
];
static struct menu *rootEntry;
static void print_help(struct menu *menu)
static struct menu *rootEntry;
static void print_help(struct menu *menu)
@@
-69,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)
@@
-102,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);
/* fall through */
case oldaskconfig:
fflush(stdout);
- xfgets(line, 128, stdin);
- if (!tty_stdio)
- printf("\n");
+ xfgets(line, sizeof(line), stdin);
return 1;
default:
break;
return 1;
default:
break;
@@
-188,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);
@@
-292,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) {
@@
-303,11
+295,10
@@
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);
- xfgets(line,
128
, stdin);
+ xfgets(line,
sizeof(line)
, stdin);
strip(line);
if (line[0] == '?') {
print_help(menu);
strip(line);
if (line[0] == '?') {
print_help(menu);
@@
-486,7
+477,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') {
@@
-540,7
+531,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);
}
@@
-553,9
+544,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;
@@
-603,8
+596,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);
@@
-666,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");
-}