author | kergoth <kergoth> | 2003-06-17 17:03:49 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-06-17 17:03:49 (UTC) |
commit | 16e53b2a2e94742f3b55ee73700bb264e36638d4 (patch) (side-by-side diff) | |
tree | 4f2b65a635d25c1ce0cfeea7953623c2bf7d9534 /scripts/kconfig/mconf.c | |
parent | 384b7f1a42f9f2f101dc8fe11c3625055d96f672 (diff) | |
download | opie-16e53b2a2e94742f3b55ee73700bb264e36638d4.zip opie-16e53b2a2e94742f3b55ee73700bb264e36638d4.tar.gz opie-16e53b2a2e94742f3b55ee73700bb264e36638d4.tar.bz2 |
Update LinuxKernelConf version to 1.4.
-rw-r--r-- | scripts/kconfig/mconf.c | 66 |
1 files changed, 44 insertions, 22 deletions
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 6d82718..b9cf25f 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -50,5 +50,5 @@ setmod_text[] = "As a result, this feature will be built as a module.", nohelp_text[] = - "There is no help available for this kernel option.\n", + "There is no help available for this option.\n", load_config_text[] = "Enter the name of the configuration file you wish to load. " @@ -57,9 +57,9 @@ load_config_text[] = load_config_help[] = "\n" - "For various reasons, one may wish to keep several different kernel\n" + "For various reasons, one may wish to keep several different \n" "configurations available on a single machine.\n" "\n" "If you have saved a previous configuration in a file other than the\n" - "kernel's default, entering the name of the file here will allow you\n" + "default, entering the name of the file here will allow you\n" "to modify that configuration.\n" "\n" @@ -71,5 +71,5 @@ save_config_text[] = save_config_help[] = "\n" - "For various reasons, one may wish to keep different kernel\n" + "For various reasons, one may wish to keep different\n" "configurations available on a single machine.\n" "\n" @@ -148,4 +148,5 @@ static void init_wsize(void) static void cprint_init(void) { + char *env = getenv("LXDIALOG"); bufptr = buf; argptr = args; @@ -153,5 +154,9 @@ static void cprint_init(void) indent = 0; child_count = 0; - cprint("./scripts/lxdialog/lxdialog"); + if(env != NULL) { + cprint(env); + } else { + cprint("./scripts/lxdialog/lxdialog"); + } cprint("--backtitle"); cprint(menu_backtitle); @@ -303,9 +308,6 @@ static void build_conf(struct menu *menu) menu->data ? "-->" : "++>", indent + 1, ' ', prompt); - } else { - if (menu->parent != &rootmenu) - cprint1(" %*c", indent + 1, ' '); - cprint1("%s --->", prompt); - } + } else + cprint1(" %*c%s --->", indent + 1, ' ', prompt); cprint_done(); @@ -374,4 +376,9 @@ static void build_conf(struct menu *menu) cprint_done(); } else { + if (menu == current_menu) { + cprint(":%p", menu); + cprint("---%*c%s", indent + 1, ' ', menu_get_prompt(menu)); + goto conf_childs; + } child_count++; val = sym_get_tristate_value(sym); @@ -383,5 +390,8 @@ static void build_conf(struct menu *menu) case S_BOOLEAN: cprint("t%p", menu); - cprint1("[%c]", val == no ? ' ' : '*'); + if (sym_is_changable(sym)) + cprint1("[%c]", val == no ? ' ' : '*'); + else + cprint1("---"); break; case S_TRISTATE: @@ -392,5 +402,8 @@ static void build_conf(struct menu *menu) default: ch = ' '; break; } - cprint1("<%c>", ch); + if (sym_is_changable(sym)) + cprint1("<%c>", ch); + else + cprint1("---"); break; default: @@ -401,5 +414,6 @@ static void build_conf(struct menu *menu) tmp = 0; cprint1("%*c%s%s", tmp, ' ', menu_get_prompt(menu), - sym_has_value(sym) ? "" : " (NEW)"); + (sym_has_value(sym) || !sym_is_changable(sym)) ? + "" : " (NEW)"); cprint_done(); goto conf_childs; @@ -407,5 +421,11 @@ static void build_conf(struct menu *menu) } cprint1("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu), - sym_has_value(sym) ? "" : " (NEW)"); + (sym_has_value(sym) || !sym_is_changable(sym)) ? + "" : " (NEW)"); + if (menu->prompt->type == P_MENU) { + cprint1(" --->"); + cprint_done(); + return; + } cprint_done(); } @@ -446,7 +466,7 @@ static void conf(struct menu *menu) cprint("--- "); cprint("L"); - cprint("Load an Alternate Configuration File"); + cprint(" Load an Alternate Configuration File"); cprint("S"); - cprint("Save Configuration to an Alternate File"); + cprint(" Save Configuration to an Alternate File"); } stat = exec_conf(); @@ -485,4 +505,6 @@ static void conf(struct menu *menu) if (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes) conf_choice(submenu); + else if (submenu->prompt->type == P_MENU) + conf(submenu); break; case 's': @@ -745,6 +767,5 @@ int main(int ac, char **av) sym = sym_lookup("KERNELRELEASE", 0); sym_calc_value(sym); - sprintf(menu_backtitle, "Opie %s Configuration", - sym_get_string_value(sym)); + sprintf(menu_backtitle, "Build Configuration"); mode = getenv("MENUCONFIG_MODE"); @@ -771,9 +792,10 @@ int main(int ac, char **av) conf_write(NULL); printf("\n\n" - "*** End of Opie configuration.\n" - "*** Check the top-level Makefile for additional configuration.\n" - "*** Next, you may run 'make'.\n\n"); + "*** End of configuration.\n" + "\n\n"); } else - printf("\n\nYour Opie configuration changes were NOT saved.\n\n"); + printf("\n\n" + "Your configuration changes were NOT saved." + "\n\n"); return 0; |