Updated to match trunk/uClibc/extra/config as of r10132, and thus

Linux 2.6.11.

1 files changed, 320 insertions, 56 deletions

diff --git a/scripts/config/mconf.c b/scripts/config/mconf.c
index 63b4ff72f..5bc2abdd8 100644
--- a/scripts/config/mconf.c
+++ b/scripts/config/mconf.c
@@ -23,18 +23,150 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include "dialog.h"
+#include "lxdialog/dialog.h"
 
 #define LKC_DIRECT_LINK
 #include "lkc.h"
 
 static char menu_backtitle[128];
-static const char menu_instructions[] =
+static const char mconf_readme[] =
+"Overview\n"
+"--------\n"
+"Some features may be built directly into BusyBox.  Some features\n"
+"may be completely removed altogether.  There are also certain\n"
+"parameters which are not really features, but must be\n"
+"entered in as decimal or hexadecimal numbers or possibly text.\n"
+"\n"
+"Menu items beginning with [*] or [ ] represent features\n"
+"configured to be built in or removed respectively.\n"
+"\n"
+"To change any of these features, highlight it with the cursor\n"
+"keys and press <Y> to build it in or <N> to removed it.\n"
+"You may also press the <Space Bar> to cycle\n"
+"through the available options (ie. Y->N->Y).\n"
+"\n"
+"Some additional keyboard hints:\n"
+"\n"
+"Menus\n"
+"----------\n"
+"o  Use the Up/Down arrow keys (cursor keys) to highlight the item\n"
+"   you wish to change or submenu wish to select and press <Enter>.\n"
+"   Submenus are designated by \"--->\".\n"
+"\n"
+"   Shortcut: Press the option's highlighted letter (hotkey).\n"
+"             Pressing a hotkey more than once will sequence\n"
+"             through all visible items which use that hotkey.\n"
+"\n"
+"   You may also use the <PAGE UP> and <PAGE DOWN> keys to scroll\n"
+"   unseen options into view.\n"
+"\n"
+"o  To exit a menu use the cursor keys to highlight the <Exit> button\n"
+"   and press <ENTER>.\n"
+"\n"
+"   Shortcut: Press <ESC><ESC> or <E> or <X> if there is no hotkey\n"
+"             using those letters.  You may press a single <ESC>, but\n"
+"             there is a delayed response which you may find annoying.\n"
+"\n"
+"   Also, the <TAB> and cursor keys will cycle between <Select>,\n"
+"   <Exit> and <Help>\n"
+"\n"
+"o  To get help with an item, use the cursor keys to highlight <Help>\n"
+"   and Press <ENTER>.\n"
+"\n"
+"   Shortcut: Press <H> or <?>.\n"
+"\n"
+"\n"
+"Radiolists  (Choice lists)\n"
+"-----------\n"
+"o  Use the cursor keys to select the option you wish to set and press\n"
+"   <S> or the <SPACE BAR>.\n"
+"\n"
+"   Shortcut: Press the first letter of the option you wish to set then\n"
+"             press <S> or <SPACE BAR>.\n"
+"\n"
+"o  To see available help for the item, use the cursor keys to highlight\n"
+"   <Help> and Press <ENTER>.\n"
+"\n"
+"   Shortcut: Press <H> or <?>.\n"
+"\n"
+"   Also, the <TAB> and cursor keys will cycle between <Select> and\n"
+"   <Help>\n"
+"\n"
+"\n"
+"Data Entry\n"
+"-----------\n"
+"o  Enter the requested information and press <ENTER>\n"
+"   If you are entering hexadecimal values, it is not necessary to\n"
+"   add the '0x' prefix to the entry.\n"
+"\n"
+"o  For help, use the <TAB> or cursor keys to highlight the help option\n"
+"   and press <ENTER>.  You can try <TAB><H> as well.\n"
+"\n"
+"\n"
+"Text Box    (Help Window)\n"
+"--------\n"
+"o  Use the cursor keys to scroll up/down/left/right.  The VI editor\n"
+"   keys h,j,k,l function here as do <SPACE BAR> and <B> for those\n"
+"   who are familiar with less and lynx.\n"
+"\n"
+"o  Press <E>, <X>, <Enter> or <Esc><Esc> to exit.\n"
+"\n"
+"\n"
+"Alternate Configuration Files\n"
+"-----------------------------\n"
+"Menuconfig supports the use of alternate configuration files for\n"
+"those who, for various reasons, find it necessary to switch\n"
+"between different configurations.\n"
+"\n"
+"At the end of the main menu you will find two options.  One is\n"
+"for saving the current configuration to a file of your choosing.\n"
+"The other option is for loading a previously saved alternate\n"
+"configuration.\n"
+"\n"
+"Even if you don't use alternate configuration files, but you\n"
+"find during a Menuconfig session that you have completely messed\n"
+"up your settings, you may use the \"Load Alternate...\" option to\n"
+"restore your previously saved settings from \".config\" without\n"
+"restarting Menuconfig.\n"
+"\n"
+"Other information\n"
+"-----------------\n"
+"If you use Menuconfig in an XTERM window make sure you have your\n"
+"$TERM variable set to point to a xterm definition which supports color.\n"
+"Otherwise, Menuconfig will look rather bad.  Menuconfig will not\n"
+"display correctly in a RXVT window because rxvt displays only one\n"
+"intensity of color, bright.\n"
+"\n"
+"Menuconfig will display larger menus on screens or xterms which are\n"
+"set to display more than the standard 25 row by 80 column geometry.\n"
+"In order for this to work, the \"stty size\" command must be able to\n"
+"display the screen's current row and column geometry.  I STRONGLY\n"
+"RECOMMEND that you make sure you do NOT have the shell variables\n"
+"LINES and COLUMNS exported into your environment.  Some distributions\n"
+"export those variables via /etc/profile.  Some ncurses programs can\n"
+"become confused when those variables (LINES & COLUMNS) don't reflect\n"
+"the true screen size.\n"
+"\n"
+"Optional personality available\n"
+"------------------------------\n"
+"If you prefer to have all of the options listed in a single\n"
+"menu, rather than the default multimenu hierarchy, run the menuconfig\n"
+"with MENUCONFIG_MODE environment variable set to single_menu. Example:\n"
+"\n"
+"make MENUCONFIG_MODE=single_menu menuconfig\n"
+"\n"
+"<Enter> will then unroll the appropriate category, or enfold it if it\n"
+"is already unrolled.\n"
+"\n"
+"Note that this mode can eventually be a little more CPU expensive\n"
+"(especially with a larger number of unrolled categories) than the\n"
+"default mode.\n",
+menu_instructions[] =
         "Arrow keys navigate the menu.  "
         "<Enter> selects submenus --->.  "
         "Highlighted letters are hotkeys.  "
         "Pressing <Y> selectes a feature, while <N> will exclude a feature.  "
-        "Press <Esc><Esc> to exit, <?> for Help.  "
+        "Press <Esc><Esc> to exit, <?> for Help, </> for Search.  "
         "Legend: [*] feature is selected  [ ] feature is excluded",
 radiolist_instructions[] =
         "Use the arrow keys to navigate this window or "
@@ -85,23 +217,50 @@ save_config_help[] =
         "\n"
         "If you are uncertain what all this means then you should probably\n"
         "leave this blank.\n",
-top_menu_help[] =
+search_help[] =
         "\n"
-        "Use the Up/Down arrow keys (cursor keys) to highlight the item\n"
-        "you wish to change or submenu wish to select and press <Enter>.\n"
-        "Submenus are designated by \"--->\".\n"
+        "Search for CONFIG_ symbols and display their relations.\n"
+        "Example: search for \"^FOO\"\n"
+        "Result:\n"
+        "-----------------------------------------------------------------\n"
+        "Symbol: FOO [=m]\n"
+        "Prompt: Foo bus is used to drive the bar HW\n"
+        "Defined at drivers/pci/Kconfig:47\n"
+        "Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
+        "Location:\n"
+        "  -> Bus options (PCI, PCMCIA, EISA, MCA, ISA)\n"
+        "    -> PCI support (PCI [=y])\n"
+        "      -> PCI access mode (<choice> [=y])\n"
+        "Selects: LIBCRC32\n"
+        "Selected by: BAR\n"
+        "-----------------------------------------------------------------\n"
+        "o The line 'Prompt:' shows the text used in the menu structure for\n"
+        "  this CONFIG_ symbol\n"
+        "o The 'Defined at' line tell at what file / line number the symbol\n"
+        "  is defined\n"
+        "o The 'Depends on:' line tell what symbols needs to be defined for\n"
+        "  this symbol to be visible in the menu (selectable)\n"
+        "o The 'Location:' lines tell where in the menu structure this symbol\n"
+        "  is located\n"
+        "    A location followed by a [=y] indicate that this is a selectable\n"
+        "    menu item - and current value is displayed inside brackets.\n"
+        "o The 'Selects:' line tell what symbol will be automatically\n"
+        "  selected if this symbol is selected (y or m)\n"
+        "o The 'Selected by' line tell what symbol has selected this symbol\n"
         "\n"
-        "Shortcut: Press the option's highlighted letter (hotkey).\n"
-        "\n"
-        "You may also use the <PAGE UP> and <PAGE DOWN> keys to scroll\n"
-        "unseen options into view.\n"
-;
+        "Only relevant lines are shown.\n"
+        "\n\n"
+        "Search examples:\n"
+        "Examples: USB  => find all CONFIG_ symbols containing USB\n"
+        "          ^USB => find all CONFIG_ symbols starting with USB\n"
+        "          USB$ => find all CONFIG_ symbols ending with USB\n"
+        "\n";
 
 static char filename[PATH_MAX+1] = ".config";
-static int indent = 0;
+static int indent;
 static struct termios ios_org;
-static int rows, cols;
-struct menu *current_menu;
+static int rows = 0, cols = 0;
+static struct menu *current_menu;
 static int child_count;
 static int single_menu_mode;
 
@@ -116,33 +275,31 @@ static void conf_save(void);
 static void show_textbox(const char *title, const char *text, int r, int c);
 static void show_helptext(const char *title, const char *text);
 static void show_help(struct menu *menu);
-static void show_readme(void);
+static void show_file(const char *filename, const char *title, int r, int c);
 
 static void init_wsize(void)
 {
         struct winsize ws;
         char *env;
 
-        if (ioctl(1, TIOCGWINSZ, &ws) == -1) {
-                rows = 24;
-                cols = 80;
-        } else {
+        if (!ioctl(STDIN_FILENO, TIOCGWINSZ, &ws)) {
                 rows = ws.ws_row;
                 cols = ws.ws_col;
-                if (!rows) {
-                        env = getenv("LINES");
-                        if (env)
-                                rows = atoi(env);
-                        if (!rows)
-                                rows = 24;
-                }
-                if (!cols) {
-                        env = getenv("COLUMNS");
-                        if (env)
-                                cols = atoi(env);
-                        if (!cols)
-                                cols = 80;
-                }
+        }
+
+        if (!rows) {
+                env = getenv("LINES");
+                if (env)
+                        rows = atoi(env);
+                if (!rows)
+                        rows = 24;
+        }
+        if (!cols) {
+                env = getenv("COLUMNS");
+                if (env)
+                        cols = atoi(env);
+                if (!cols)
+                        cols = 80;
         }
 
         if (rows < 19 || cols < 80) {
@@ -214,6 +371,103 @@ static void cdone(void)
         item_no = 0;
 }
 
+static void get_prompt_str(struct gstr *r, struct property *prop)
+{
+        int i, j;
+        struct menu *submenu[8], *menu;
+
+        str_printf(r, "Prompt: %s\n", prop->text);
+        str_printf(r, "  Defined at %s:%d\n", prop->menu->file->name,
+                prop->menu->lineno);
+        if (!expr_is_yes(prop->visible.expr)) {
+                str_append(r, "  Depends on: ");
+                expr_gstr_print(prop->visible.expr, r);
+                str_append(r, "\n");
+        }
+        menu = prop->menu->parent;
+        for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent)
+                submenu[i++] = menu;
+        if (i > 0) {
+                str_printf(r, "  Location:\n");
+                for (j = 4; --i >= 0; j += 2) {
+                        menu = submenu[i];
+                        str_printf(r, "%*c-> %s", j, ' ', menu_get_prompt(menu));
+                        if (menu->sym) {
+                                str_printf(r, " (%s [=%s])", menu->sym->name ?
+                                        menu->sym->name : "<choice>",
+                                        sym_get_string_value(menu->sym));
+                        }
+                        str_append(r, "\n");
+                }
+        }
+}
+
+static void get_symbol_str(struct gstr *r, struct symbol *sym)
+{
+        bool hit;
+        struct property *prop;
+
+        str_printf(r, "Symbol: %s [=%s]\n", sym->name,
+                                       sym_get_string_value(sym));
+        for_all_prompts(sym, prop)
+                get_prompt_str(r, prop);
+        hit = false;
+        for_all_properties(sym, prop, P_SELECT) {
+                if (!hit) {
+                        str_append(r, "  Selects: ");
+                        hit = true;
+                } else
+                        str_printf(r, " && ");
+                expr_gstr_print(prop->expr, r);
+        }
+        if (hit)
+                str_append(r, "\n");
+        if (sym->rev_dep.expr) {
+                str_append(r, "  Selected by: ");
+                expr_gstr_print(sym->rev_dep.expr, r);
+                str_append(r, "\n");
+        }
+        str_append(r, "\n\n");
+}
+
+static struct gstr get_relations_str(struct symbol **sym_arr)
+{
+        struct symbol *sym;
+        struct gstr res = str_new();
+        int i;
+
+        for (i = 0; sym_arr && (sym = sym_arr[i]); i++)
+                get_symbol_str(&res, sym);
+        if (!i)
+                str_append(&res, "No matches found.\n");
+        return res;
+}
+
+static void search_conf(void)
+{
+        struct symbol **sym_arr;
+        struct gstr res;
+
+again:
+        switch (dialog_inputbox("Search Configuration Parameter",
+                                "Enter Keyword", 10, 75,
+                                NULL)) {
+        case 0:
+                break;
+        case 1:
+                show_helptext("Search Configuration", search_help);
+                goto again;
+        default:
+                return;
+        }
+
+        sym_arr = sym_re_search(dialog_input_result);
+        res = get_relations_str(sym_arr);
+        free(sym_arr);
+        show_textbox("Search Results", str_get(&res), 0, 0);
+        str_free(&res);
+}
+
 static void build_conf(struct menu *menu)
 {
         struct symbol *sym;
@@ -308,6 +562,11 @@ static void build_conf(struct menu *menu)
                         return;
                 }
         } else {
+                if (menu == current_menu) {
+                        cprint_tag(":%p", menu);
+                        cprint_name("---%*c%s", indent + 1, ' ', menu_get_prompt(menu));
+                        goto conf_childs;
+                }
                 child_count++;
                 val = sym_get_tristate_value(sym);
                 if (sym_is_choice_value(sym) && val == yes) {
@@ -376,7 +635,7 @@ static void conf(struct menu *menu)
         while (1) {
                 indent = 0;
                 child_count = 0;
-                current_menu = menu;
+                current_menu = menu;
                 cdone(); cinit();
                 build_conf(menu);
                 if (!child_count)
@@ -441,7 +700,7 @@ static void conf(struct menu *menu)
                         if (sym)
                                 show_help(submenu);
                         else
-                                show_readme();
+                                show_helptext("README", mconf_readme);
                         break;
                 case 3:
                         if (type == 't') {
@@ -465,6 +724,9 @@ static void conf(struct menu *menu)
                         else if (type == 'm')
                                 conf(submenu);
                         break;
+                case 7:
+                        search_conf();
+                        break;
                 }
         }
 }
@@ -476,37 +738,39 @@ static void show_textbox(const char *title, const char *text, int r, int c)
         fd = creat(".help.tmp", 0777);
         write(fd, text, strlen(text));
         close(fd);
-        while (dialog_textbox(title, ".help.tmp", r, c) < 0)
-                ;
+        show_file(".help.tmp", title, r, c);
         unlink(".help.tmp");
 }
 
 static void show_helptext(const char *title, const char *text)
 {
-        show_textbox(title, text, rows, cols);
+        show_textbox(title, text, 0, 0);
 }
 
 static void show_help(struct menu *menu)
 {
-        const char *help;
-        char *helptext;
+        struct gstr help = str_new();
         struct symbol *sym = menu->sym;
 
-        help = sym->help;
-        if (!help)
-                help = nohelp_text;
-        if (sym->name) {
-                helptext = malloc(strlen(sym->name) + strlen(help) + 16);
-                sprintf(helptext, "%s:\n\n%s", sym->name, help);
-                show_helptext(menu_get_prompt(menu), helptext);
-                free(helptext);
-        } else
-                show_helptext(menu_get_prompt(menu), help);
+        if (sym->help)
+        {
+                if (sym->name) {
+                        str_printf(&help, "%s:\n\n", sym->name);
+                        str_append(&help, sym->help);
+                        str_append(&help, "\n");
+                }
+        } else {
+                str_append(&help, nohelp_text);
+        }
+        get_symbol_str(&help, sym);
+        show_helptext(menu_get_prompt(menu), str_get(&help));
+        str_free(&help);
 }
 
-static void show_readme(void)
+static void show_file(const char *filename, const char *title, int r, int c)
 {
-        show_helptext("Help", top_menu_help);
+        while (dialog_textbox(title, filename, r ? r : rows, c ? c : cols) < 0)
+                ;
 }
 
 static void conf_choice(struct menu *menu)
@@ -667,9 +931,9 @@ static void winch_handler(int sig)
 
 int main(int ac, char **av)
 {
-        int stat;
-        char *mode;
         struct symbol *sym;
+        char *mode;
+        int stat;
 
         conf_parse(av[1]);
         conf_read(NULL);
@@ -697,7 +961,7 @@ int main(int ac, char **av)
         init_dialog();
         do {
                 stat = dialog_yesno(NULL,
-                                "Do you wish to save your new BusyBox configuration?", 5, 60);
+                                    "Do you wish to save your new BusyBox configuration?", 5, 60);
         } while (stat < 0);
         end_dialog();