projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: remove redundant input_mode test for check_conf() loop
[carl9170fw.git]
/
config
/
conf.c
diff --git
a/config/conf.c
b/config/conf.c
index 649ea82772335ebf8e159fc4bede8ef8cf8a39c4..927e3ba5830f0aeb7fdf19de3768f013494411f2 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>
@@
-13,12
+14,12
@@
#include <getopt.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <getopt.h>
#include <sys/stat.h>
#include <sys/time.h>
+#include <errno.h>
#include "lkc.h"
static void conf(struct menu *menu);
static void check_conf(struct menu *menu);
#include "lkc.h"
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,
@@
-32,12
+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 indent = 1;
-static int
valid_stdin = 1
;
+static int
tty_stdio
;
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)
@@
-67,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)
@@
-100,11
+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);
+ xfgets(line,
sizeof(line)
, stdin);
return 1;
default:
break;
return 1;
default:
break;
@@
-184,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);
@@
-288,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) {
@@
-299,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);
@@
-359,8
+354,7
@@
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) &&
+ if (input_mode == listnewconfig) &&
rootEntry != menu) {
check_conf(menu);
return;
rootEntry != menu) {
check_conf(menu);
return;
@@
-424,7
+418,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);
@@
-455,7
+449,7
@@
static struct option long_opts[] = {
static void conf_usage(const char *progname)
{
static void conf_usage(const char *progname)
{
- printf("Usage: %s [option] <kconfig-file>\n", progname);
+ printf("Usage: %s [
-s] [
option] <kconfig-file>\n", progname);
printf("[option] is _one_ of the following:\n");
printf(" --listnewconfig List new options\n");
printf(" --askconfig Start a new configuration using a line-oriented program\n");
printf("[option] is _one_ of the following:\n");
printf(" --listnewconfig List new options\n");
printf(" --askconfig Start a new configuration using a line-oriented program\n");
@@
-482,7
+476,13
@@
int main(int ac, char **av)
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
- while ((opt = getopt_long(ac, av, "", long_opts, NULL)) != -1) {
+ tty_stdio = isatty(0) && isatty(1);
+
+ while ((opt = getopt_long(ac, av, "s", long_opts, NULL)) != -1) {
+ if (opt == 's') {
+ conf_set_message_callback(NULL);
+ continue;
+ }
input_mode = (enum input_mode)opt;
switch (opt) {
case defconfig:
input_mode = (enum input_mode)opt;
switch (opt) {
case defconfig:
@@
-493,14
+493,24
@@
int main(int ac, char **av)
{
struct timeval now;
unsigned int seed;
{
struct timeval now;
unsigned int seed;
+ char *seed_env;
/*
* Use microseconds derived seed,
* compensate for systems where it may be zero
*/
gettimeofday(&now, NULL);
/*
* Use microseconds derived seed,
* compensate for systems where it may be zero
*/
gettimeofday(&now, NULL);
-
seed = (unsigned int)((now.tv_sec + 1) * (now.tv_usec + 1));
seed = (unsigned int)((now.tv_sec + 1) * (now.tv_usec + 1));
+
+ seed_env = getenv("KCONFIG_SEED");
+ if( seed_env && *seed_env ) {
+ char *endp;
+ int tmp = (int)strtol(seed_env, &endp, 0);
+ if (*endp == '\0') {
+ seed = tmp;
+ }
+ }
+ fprintf( stderr, "KCONFIG_SEED=0x%X\n", seed );
srand(seed);
break;
}
srand(seed);
break;
}
@@
-520,7
+530,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);
}
@@
-533,9
+543,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;
@@
-583,8
+595,6
@@
int main(int ac, char **av)
break;
}
break;
}
- valid_stdin = isatty(0) && isatty(1) && isatty(2);
-
switch (input_mode) {
case allnoconfig:
conf_set_all_new_symbols(def_no);
switch (input_mode) {
case allnoconfig:
conf_set_all_new_symbols(def_no);
@@
-599,7
+609,8
@@
int main(int ac, char **av)
conf_set_all_new_symbols(def_default);
break;
case randconfig:
conf_set_all_new_symbols(def_default);
break;
case randconfig:
- conf_set_all_new_symbols(def_random);
+ /* Really nothing to do in this loop */
+ while (conf_set_all_new_symbols(def_random)) ;
break;
case defconfig:
conf_set_all_new_symbols(def_default);
break;
case defconfig:
conf_set_all_new_symbols(def_default);
@@
-618,16
+629,14
@@
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;
}
if (input_mode == savedefconfig) {
if (conf_write_defconfig(defconfig_file)) {
fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"),
break;
}
if (input_mode == savedefconfig) {
if (conf_write_defconfig(defconfig_file)) {
fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"),
- defconfig_file);
+ defconfig_file);
return 1;
}
} else if (input_mode != listnewconfig) {
return 1;
}
} else if (input_mode != listnewconfig) {
@@
-645,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");
-}