diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/kconfig/conf.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index f208f900ed3a..0fdda9169308 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
@@ -574,8 +574,13 @@ int main(int ac, char **av) | |||
574 | case alldefconfig: | 574 | case alldefconfig: |
575 | case randconfig: | 575 | case randconfig: |
576 | name = getenv("KCONFIG_ALLCONFIG"); | 576 | name = getenv("KCONFIG_ALLCONFIG"); |
577 | if (name && !stat(name, &tmpstat)) { | 577 | if (name && (strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) { |
578 | conf_read_simple(name, S_DEF_USER); | 578 | if (conf_read_simple(name, S_DEF_USER)) { |
579 | fprintf(stderr, | ||
580 | _("*** Can't read seed configuration \"%s\"!\n"), | ||
581 | name); | ||
582 | exit(1); | ||
583 | } | ||
579 | break; | 584 | break; |
580 | } | 585 | } |
581 | switch (input_mode) { | 586 | switch (input_mode) { |
@@ -586,10 +591,13 @@ int main(int ac, char **av) | |||
586 | case randconfig: name = "allrandom.config"; break; | 591 | case randconfig: name = "allrandom.config"; break; |
587 | default: break; | 592 | default: break; |
588 | } | 593 | } |
589 | if (!stat(name, &tmpstat)) | 594 | if (conf_read_simple(name, S_DEF_USER) && |
590 | conf_read_simple(name, S_DEF_USER); | 595 | conf_read_simple("all.config", S_DEF_USER)) { |
591 | else if (!stat("all.config", &tmpstat)) | 596 | fprintf(stderr, |
592 | conf_read_simple("all.config", S_DEF_USER); | 597 | _("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"), |
598 | name); | ||
599 | exit(1); | ||
600 | } | ||
593 | break; | 601 | break; |
594 | default: | 602 | default: |
595 | break; | 603 | break; |