projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: report recursive dependency involving 'imply'
[carl9170fw.git]
/
config
/
conf.c
diff --git
a/config/conf.c
b/config/conf.c
index e525e5ec0245822ffd918f83cd0d982c07038042..2f968e25b3c0c8bf40972ccd324815c6cc5d4391 100644
(file)
--- a/
config/conf.c
+++ b/
config/conf.c
@@
-3,7
+3,6
@@
* Released under the terms of the GNU GPL v2.0.
*/
* Released under the terms of the GNU GPL v2.0.
*/
-#include <locale.h>
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
@@
-84,7
+83,7
@@
static int conf_askvalue(struct symbol *sym, const char *def)
enum symbol_type type = sym_get_type(sym);
if (!sym_has_value(sym))
enum symbol_type type = sym_get_type(sym);
if (!sym_has_value(sym))
- printf(
_("(NEW) ")
);
+ printf(
"(NEW) "
);
line[0] = '\n';
line[1] = 0;
line[0] = '\n';
line[1] = 0;
@@
-130,7
+129,7
@@
static int conf_string(struct menu *menu)
const char *def;
while (1) {
const char *def;
while (1) {
- printf("%*s%s ", indent - 1, "",
_(menu->prompt->text)
);
+ printf("%*s%s ", indent - 1, "",
menu->prompt->text
);
printf("(%s) ", sym->name);
def = sym_get_string_value(sym);
if (sym_get_string_value(sym))
printf("(%s) ", sym->name);
def = sym_get_string_value(sym);
if (sym_get_string_value(sym))
@@
-163,7
+162,7
@@
static int conf_sym(struct menu *menu)
tristate oldval, newval;
while (1) {
tristate oldval, newval;
while (1) {
- printf("%*s%s ", indent - 1, "",
_(menu->prompt->text)
);
+ printf("%*s%s ", indent - 1, "",
menu->prompt->text
);
if (sym->name)
printf("(%s) ", sym->name);
putchar('[');
if (sym->name)
printf("(%s) ", sym->name);
putchar('[');
@@
-248,7
+247,7
@@
static int conf_choice(struct menu *menu)
case no:
return 1;
case mod:
case no:
return 1;
case mod:
- printf("%*s%s\n", indent - 1, "",
_(menu_get_prompt(menu)
));
+ printf("%*s%s\n", indent - 1, "",
menu_get_prompt(menu
));
return 0;
case yes:
break;
return 0;
case yes:
break;
@@
-258,7
+257,7
@@
static int conf_choice(struct menu *menu)
while (1) {
int cnt, def;
while (1) {
int cnt, def;
- printf("%*s%s\n", indent - 1, "",
_(menu_get_prompt(menu)
));
+ printf("%*s%s\n", indent - 1, "",
menu_get_prompt(menu
));
def_sym = sym_get_choice_value(sym);
cnt = def = 0;
line[0] = 0;
def_sym = sym_get_choice_value(sym);
cnt = def = 0;
line[0] = 0;
@@
-266,7
+265,7
@@
static int conf_choice(struct menu *menu)
if (!menu_is_visible(child))
continue;
if (!child->sym) {
if (!menu_is_visible(child))
continue;
if (!child->sym) {
- printf("%*c %s\n", indent, '*',
_(menu_get_prompt(child)
));
+ printf("%*c %s\n", indent, '*',
menu_get_prompt(child
));
continue;
}
cnt++;
continue;
}
cnt++;
@@
-275,14
+274,14
@@
static int conf_choice(struct menu *menu)
printf("%*c", indent, '>');
} else
printf("%*c", indent, ' ');
printf("%*c", indent, '>');
} else
printf("%*c", indent, ' ');
- printf(" %d. %s", cnt,
_(menu_get_prompt(child)
));
+ printf(" %d. %s", cnt,
menu_get_prompt(child
));
if (child->sym->name)
printf(" (%s)", child->sym->name);
if (!sym_has_value(child->sym))
if (child->sym->name)
printf(" (%s)", child->sym->name);
if (!sym_has_value(child->sym))
- printf(
_(" (NEW)")
);
+ printf(
" (NEW)"
);
printf("\n");
}
printf("\n");
}
- printf(
_("%*schoice")
, indent - 1, "");
+ printf(
"%*schoice"
, indent - 1, "");
if (cnt == 1) {
printf("[1]: 1\n");
goto conf_childs;
if (cnt == 1) {
printf("[1]: 1\n");
goto conf_childs;
@@
-368,7
+367,7
@@
static void conf(struct menu *menu)
if (prompt)
printf("%*c\n%*c %s\n%*c\n",
indent, '*',
if (prompt)
printf("%*c\n%*c %s\n%*c\n",
indent, '*',
- indent, '*',
_(prompt)
,
+ indent, '*',
prompt
,
indent, '*');
default:
;
indent, '*');
default:
;
@@
-433,7
+432,7
@@
static void check_conf(struct menu *menu)
}
} else {
if (!conf_cnt++)
}
} else {
if (!conf_cnt++)
- printf(
_("*\n* Restart config...\n*\n")
);
+ printf(
"*\n* Restart config...\n*\n"
);
rootEntry = menu_get_parent_menu(menu);
conf(rootEntry);
}
rootEntry = menu_get_parent_menu(menu);
conf(rootEntry);
}
@@
-484,10
+483,7
@@
int main(int ac, char **av)
int opt;
const char *name, *defconfig_file = NULL /* gcc uninit */;
struct stat tmpstat;
int opt;
const char *name, *defconfig_file = NULL /* gcc uninit */;
struct stat tmpstat;
-
- setlocale(LC_ALL, "");
- bindtextdomain(PACKAGE, LOCALEDIR);
- textdomain(PACKAGE);
+ int no_conf_write = 0;
tty_stdio = isatty(0) && isatty(1);
tty_stdio = isatty(0) && isatty(1);
@@
-543,7
+539,7
@@
int main(int ac, char **av)
}
}
if (ac == optind) {
}
}
if (ac == optind) {
- fprintf(stderr,
_("%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);
}
@@
-557,9
+553,9
@@
int main(int ac, char **av)
defconfig_file = conf_get_default_confname();
if (conf_read(defconfig_file)) {
fprintf(stderr,
defconfig_file = conf_get_default_confname();
if (conf_read(defconfig_file)) {
fprintf(stderr,
-
_(
"***\n"
+ "***\n"
"*** Can't find default configuration \"%s\"!\n"
"*** Can't find default configuration \"%s\"!\n"
- "***\n"
)
,
+ "***\n",
defconfig_file);
exit(1);
}
defconfig_file);
exit(1);
}
@@
-582,7
+578,7
@@
int main(int ac, char **av)
if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) {
if (conf_read_simple(name, S_DEF_USER)) {
fprintf(stderr,
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")
,
+
"*** Can't read seed configuration \"%s\"!\n"
,
name);
exit(1);
}
name);
exit(1);
}
@@
-599,7
+595,7
@@
int main(int ac, char **av)
if (conf_read_simple(name, S_DEF_USER) &&
conf_read_simple("all.config", S_DEF_USER)) {
fprintf(stderr,
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")
,
+
"*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"
,
name);
exit(1);
}
name);
exit(1);
}
@@
-648,7
+644,7
@@
int main(int ac, char **av)
if (input_mode == savedefconfig) {
if (conf_write_defconfig(defconfig_file)) {
if (input_mode == savedefconfig) {
if (conf_write_defconfig(defconfig_file)) {
- fprintf(stderr,
_("n*** Error while saving defconfig to: %s\n\n")
,
+ fprintf(stderr,
"n*** Error while saving defconfig to: %s\n\n"
,
defconfig_file);
return 1;
}
defconfig_file);
return 1;
}
@@
-656,12
+652,12
@@
int main(int ac, char **av)
/*
* build so we shall update autoconf.
*/
/*
* build so we shall update autoconf.
*/
- if (conf_write(NULL)) {
- fprintf(stderr,
_("\n*** Error during writing of the configuration.\n\n")
);
+ if (
!no_conf_write &&
conf_write(NULL)) {
+ fprintf(stderr,
"\n*** Error during writing of the configuration.\n\n"
);
exit(1);
}
if (conf_write_autoconf()) {
exit(1);
}
if (conf_write_autoconf()) {
- fprintf(stderr,
_("\n*** Error during update of the configuration.\n\n")
);
+ fprintf(stderr,
"\n*** Error during update of the configuration.\n\n"
);
return 1;
}
}
return 1;
}
}