projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: Fix expr_free() E_NOT leak
[carl9170fw.git]
/
config
/
conf.c
diff --git
a/config/conf.c
b/config/conf.c
index 6fdacb31a51ac712f196c397b753f45a1efd66de..6be614318782bfc3c2e3525a8ebc5ad94d775f70 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,6
+14,7
@@
#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"
#include "lkc.h"
@@
-35,9
+37,10
@@
enum input_mode {
} input_mode = oldaskconfig;
static int indent = 1;
} input_mode = oldaskconfig;
static int indent = 1;
+static int tty_stdio;
static int valid_stdin = 1;
static int conf_cnt;
static int valid_stdin = 1;
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)
@@
-104,7
+107,9
@@
static int conf_askvalue(struct symbol *sym, const char *def)
/* fall through */
case oldaskconfig:
fflush(stdout);
/* fall through */
case oldaskconfig:
fflush(stdout);
- xfgets(line, 128, stdin);
+ xfgets(line, sizeof(line), stdin);
+ if (!tty_stdio)
+ printf("\n");
return 1;
default:
break;
return 1;
default:
break;
@@
-303,7
+308,7
@@
static int conf_choice(struct menu *menu)
/* 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);
@@
-455,7
+460,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
+487,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) && isatty(2);
+
+ 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
+504,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;
}
@@
-552,8
+573,15
@@
int main(int ac, char **av)
case alldefconfig:
case randconfig:
name = getenv("KCONFIG_ALLCONFIG");
case alldefconfig:
case randconfig:
name = getenv("KCONFIG_ALLCONFIG");
- if (name && !stat(name, &tmpstat)) {
- conf_read_simple(name, S_DEF_USER);
+ if (!name)
+ break;
+ if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) {
+ if (conf_read_simple(name, S_DEF_USER)) {
+ fprintf(stderr,
+ _("*** Can't read seed configuration \"%s\"!\n"),
+ name);
+ exit(1);
+ }
break;
}
switch (input_mode) {
break;
}
switch (input_mode) {
@@
-564,16
+592,19
@@
int main(int ac, char **av)
case randconfig: name = "allrandom.config"; break;
default: break;
}
case randconfig: name = "allrandom.config"; break;
default: break;
}
- if (!stat(name, &tmpstat))
- conf_read_simple(name, S_DEF_USER);
- else if (!stat("all.config", &tmpstat))
- conf_read_simple("all.config", S_DEF_USER);
+ if (conf_read_simple(name, S_DEF_USER) &&
+ conf_read_simple("all.config", S_DEF_USER)) {
+ fprintf(stderr,
+ _("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"),
+ name);
+ exit(1);
+ }
break;
default:
break;
}
break;
default:
break;
}
- valid_stdin =
isatty(0) && isatty(1) && isatty(2)
;
+ valid_stdin =
tty_stdio
;
switch (input_mode) {
case allnoconfig:
switch (input_mode) {
case allnoconfig:
@@
-589,7
+620,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);
@@
-617,7
+649,7
@@
int main(int ac, char **av)
if (input_mode == savedefconfig) {
if (conf_write_defconfig(defconfig_file)) {
fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"),
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) {