ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-01-31 08:25:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #485 from bhundven/update_kconfig

Browse Source 
kconfig: sync upstream changes
This commit is contained in:
Bryan Hundven 2016-12-01 08:31:08 -08:00 committed by GitHub
commit 812ed6856e
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kconfig/conf.c
View File

@ -5,6 +5,7 @@
#include <locale.h>
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -41,7 +42,7 @@ static int tty_stdio;
static int valid_stdin = 1;
static int sync_kconfig;
static int conf_cnt;
static char line[128];
static char line[PATH_MAX];
static struct menu *rootEntry;
static void print_help(struct menu *menu)
@ -109,7 +110,7 @@ static int conf_askvalue(struct symbol *sym, const char *def)
/* fall through */
case oldaskconfig:
fflush(stdout);
xfgets(line, 128, stdin);
xfgets(line, sizeof(line), stdin);
if (!tty_stdio)
printf("\n");
return 1;
@ -311,7 +312,7 @@ static int conf_choice(struct menu *menu)
/* fall through */
case oldaskconfig:
fflush(stdout);
xfgets(line, 128, stdin);
xfgets(line, sizeof(line), stdin);
strip(line);
if (line[0] == '?') {
print_help(menu);

16
kconfig/confdata.c
View File

@ -267,10 +267,8 @@ int conf_read_simple(const char *name, int def)
if (in)
goto load;
sym_add_change_count(1);
if (!sym_defconfig_list) {
sym_calc_value(modules_sym);
if (!sym_defconfig_list)
return 1;
}
for_all_defaults(sym_defconfig_list, prop) {
if (expr_calc_value(prop->visible.expr) == no ||
@ -377,7 +375,9 @@ load:
continue;
} else {
if (line[0] != '\r' && line[0] != '\n')
conf_warning("unexpected data");
conf_warning("unexpected data: %.*s",
(int)strcspn(line, "\r\n"), line);
continue;
}
setsym:
@ -403,7 +403,6 @@ setsym:
}
free(line);
fclose(in);
sym_calc_value(modules_sym);
return 0;
}
@ -414,8 +413,12 @@ int conf_read(const char *name)
sym_set_change_count(0);
if (conf_read_simple(name, S_DEF_USER))
if (conf_read_simple(name, S_DEF_USER)) {
sym_calc_value(modules_sym);
return 1;
}
sym_calc_value(modules_sym);
for_all_symbols(i, sym) {
sym_calc_value(sym);
@ -846,6 +849,7 @@ static int conf_split_config(void)
name = conf_get_autoconfig_name();
conf_read_simple(name, S_DEF_AUTO);
sym_calc_value(modules_sym);
if (chdir("include/config"))
return 1;

14
kconfig/symbol.c
View File

@ -209,12 +209,26 @@ static void sym_set_all_changed(void)
static void sym_calc_visibility(struct symbol *sym)
{
struct property *prop;
struct symbol *choice_sym = NULL;
tristate tri;
/* any prompt visible? */
tri = no;
if (sym_is_choice_value(sym))
choice_sym = prop_get_symbol(sym_get_choice_prop(sym));
for_all_prompts(sym, prop) {
prop->visible.tri = expr_calc_value(prop->visible.expr);
/*
* Tristate choice_values with visibility 'mod' are
* not visible if the corresponding choice's value is
* 'yes'.
*/
if (choice_sym && sym->type == S_TRISTATE &&
prop->visible.tri == mod && choice_sym->curr.tri == yes)
prop->visible.tri = no;
tri = EXPR_OR(tri, prop->visible.tri);
}
if (tri == mod && (sym->type != S_TRISTATE || modules_val == no))