aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2004-01-16 12:49:06 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2004-01-16 12:49:06 +0000
commit16f94a672213047fc9c6722a5c4c7a3a9a0dbcb4 (patch)
tree6af9f154995d3e7b79b2c9b58dfb4867d705fcac /scripts
parent17b4a20a9c4dc7ec9fdf91cea34b35bc4ef6e070 (diff)
downloadbusybox-16f94a672213047fc9c6722a5c4c7a3a9a0dbcb4.tar.gz
busybox-16f94a672213047fc9c6722a5c4c7a3a9a0dbcb4.tar.bz2
Minor updates from linux 2.6.1
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config/conf.c41
-rw-r--r--scripts/config/confdata.c2
2 files changed, 30 insertions, 13 deletions
diff --git a/scripts/config/conf.c b/scripts/config/conf.c
index 013a679dd..3b0c1c1b5 100644
--- a/scripts/config/conf.c
+++ b/scripts/config/conf.c
@@ -26,6 +26,7 @@ enum {
set_no,
set_random
} input_mode = ask_all;
+char *defconfig_file;
static int indent = 1;
static int valid_stdin = 1;
@@ -174,7 +175,7 @@ int conf_string(struct menu *menu)
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 @@ static void check_conf(struct menu *menu)
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 @@ int main(int ac, char **av)
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 @@ int main(int ac, char **av)
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 @@ int main(int ac, char **av)
printf("***\n"
"*** You have not yet configured BusyBox!\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 @@ int main(int ac, char **av)
conf_cnt = 0;
check_conf(&rootmenu);
} while (conf_cnt);
- conf_write(NULL);
+ if (conf_write(NULL)) {
+ fprintf(stderr, "\n*** Error during writing of the BusyBox configuration.\n\n");
+ return 1;
+ }
return 0;
}
diff --git a/scripts/config/confdata.c b/scripts/config/confdata.c
index aca6864cc..c46aea81d 100644
--- a/scripts/config/confdata.c
+++ b/scripts/config/confdata.c
@@ -52,7 +52,7 @@ static char *conf_expand_value(const char *in)
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);