[uClibc-cvs] uClibc/extra/config Kconfig-language.txt, 1.2, 1.3 conf.c, 1.4, 1.5 confdata.c, 1.9, 1.10
Erik Andersen
andersen at uclibc.org
Fri Jan 16 12:49:09 UTC 2004
- Previous message: [uClibc-cvs] uClibc/libc Makefile,1.34,1.35
- Next message: [uClibc-cvs] uClibc/extra/Configs Config.alpha, 1.16, 1.17 Config.arm, 1.40, 1.41 Config.cris, 1.10, 1.11 Config.e1, 1.6, 1.7 Config.h8300, 1.18, 1.19 Config.i386, 1.37, 1.38 Config.i960, 1.14, 1.15 Config.in.arch, 1.12, 1.13 Config.m68k, 1.35, 1.36 Config.microblaze, 1.5, 1.6 Config.mips, 1.39, 1.40 Config.powerpc, 1.33, 1.34 Config.sh, 1.47, 1.48 Config.sparc, 1.16, 1.17 Config.v850, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/cvs/uClibc/extra/config
In directory nail:/tmp/cvs-serv21811
Modified Files:
Kconfig-language.txt conf.c confdata.c
Log Message:
Minor updates from linux 2.6.1
Index: confdata.c
===================================================================
RCS file: /var/cvs/uClibc/extra/config/confdata.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- confdata.c 4 Nov 2003 20:58:12 -0000 1.9
+++ confdata.c 16 Jan 2004 12:49:06 -0000 1.10
@@ -52,7 +52,7 @@
char *conf_get_default_confname(void)
{
struct stat buf;
- static char fullname[4096+1];
+ static char fullname[PATH_MAX+1];
char *env, *name;
name = conf_expand_value(conf_defname);
Index: conf.c
===================================================================
RCS file: /var/cvs/uClibc/extra/config/conf.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- conf.c 5 Aug 2003 01:52:38 -0000 1.4
+++ conf.c 16 Jan 2004 12:49:06 -0000 1.5
@@ -26,6 +26,7 @@
set_no,
set_random
} input_mode = ask_all;
+char *defconfig_file;
static int indent = 1;
static int valid_stdin = 1;
@@ -174,7 +175,7 @@
break;
case '?':
/* print help */
- if (line[1] == 0) {
+ if (line[1] == '\n') {
help = nohelp_text;
if (menu->sym->help)
help = menu->sym->help;
@@ -483,11 +484,12 @@
int main(int ac, char **av)
{
+ int i = 1;
const char *name;
struct stat tmpstat;
- if (ac > 1 && av[1][0] == '-') {
- switch (av[1][1]) {
+ if (ac > i && av[i][0] == '-') {
+ switch (av[i++][1]) {
case 'o':
input_mode = ask_new;
break;
@@ -498,6 +500,15 @@
case 'd':
input_mode = set_default;
break;
+ case 'D':
+ input_mode = set_default;
+ defconfig_file = av[i++];
+ if (!defconfig_file) {
+ printf("%s: No default config file specified\n",
+ av[0]);
+ exit(1);
+ }
+ break;
case 'n':
input_mode = set_no;
break;
@@ -516,18 +527,21 @@
printf("%s [-o|-s] config\n", av[0]);
exit(0);
}
- name = av[2];
- } else
- name = av[1];
+ }
+ name = av[i];
+ if (!name) {
+ printf("%s: configuration file missing\n", av[0]);
+ }
conf_parse(name);
//zconfdump(stdout);
switch (input_mode) {
case set_default:
- name = conf_get_default_confname();
- if (conf_read(name)) {
+ if (!defconfig_file)
+ defconfig_file = conf_get_default_confname();
+ if (conf_read(defconfig_file)) {
printf("***\n"
"*** Can't find default configuration \"%s\"!\n"
- "***\n", name);
+ "***\n", defconfig_file);
exit(1);
}
break;
@@ -536,8 +550,8 @@
printf("***\n"
"*** You have not yet configured uClibc!\n"
"***\n"
- "*** Please run some configurator (e.g. \"make config\" or\n"
- "*** \"make oldconfig\" or \"make menuconfig\").\n"
+ "*** Please run some configurator (e.g. \"make oldconfig\" or\n"
+ "*** \"make menuconfig\" or \"make config\").\n"
"***\n");
exit(1);
}
@@ -561,6 +575,9 @@
conf_cnt = 0;
check_conf(&rootmenu);
} while (conf_cnt);
- conf_write(NULL);
+ if (conf_write(NULL)) {
+ fprintf(stderr, "\n*** Error during writing of the uClibc configuration.\n\n");
+ return 1;
+ }
return 0;
}
Index: Kconfig-language.txt
===================================================================
RCS file: /var/cvs/uClibc/extra/config/Kconfig-language.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kconfig-language.txt 4 Nov 2003 13:07:47 -0000 1.2
+++ Kconfig-language.txt 16 Jan 2004 12:49:06 -0000 1.3
@@ -141,8 +141,8 @@
otherwise 'y'.
(4) Returns the value of the expression. Used to override precedence.
(5) Returns the result of (2-/expr/).
-(6) Returns the result of max(/expr/, /expr/).
-(7) Returns the result of min(/expr/, /expr/).
+(6) Returns the result of min(/expr/, /expr/).
+(7) Returns the result of max(/expr/, /expr/).
An expression can have a value of 'n', 'm' or 'y' (or 0, 1, 2
respectively for calculations). A menu entry becomes visible when it's
- Previous message: [uClibc-cvs] uClibc/libc Makefile,1.34,1.35
- Next message: [uClibc-cvs] uClibc/extra/Configs Config.alpha, 1.16, 1.17 Config.arm, 1.40, 1.41 Config.cris, 1.10, 1.11 Config.e1, 1.6, 1.7 Config.h8300, 1.18, 1.19 Config.i386, 1.37, 1.38 Config.i960, 1.14, 1.15 Config.in.arch, 1.12, 1.13 Config.m68k, 1.35, 1.36 Config.microblaze, 1.5, 1.6 Config.mips, 1.39, 1.40 Config.powerpc, 1.33, 1.34 Config.sh, 1.47, 1.48 Config.sparc, 1.16, 1.17 Config.v850, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the uClibc-cvs
mailing list