2 files changed, 5 insertions, 5 deletions

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 84699be..dec8603 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -1,711 +1,711 @@
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  * Released under the terms of the GNU GPL v2.0.
  */
 
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #define LKC_DIRECT_LINK
 #include "lkc.h"
 
 static char menu_backtitle[128];
 static const char menu_instructions[] =
         "Arrow keys navigate the menu.  "
         "<Enter> selects submenus --->.  "
         "Highlighted letters are hotkeys.  "
         "Pressing <Y> includes, <N> excludes, <M> modularizes features.  "
         "Press <Esc><Esc> to exit, <?> for Help.  "
         "Legend: [*] built-in  [ ] excluded  <M> module  < > module capable",
 radiolist_instructions[] =
         "Use the arrow keys to navigate this window or "
         "press the hotkey of the item you wish to select "
         "followed by the <SPACE BAR>. "
         "Press <?> for additional information about this option.",
 inputbox_instructions_int[] =
         "Please enter a decimal value. "
         "Fractions will not be accepted.  "
         "Use the <TAB> key to move from the input field to the buttons below it.",
 inputbox_instructions_hex[] =
         "Please enter a hexadecimal value. "
         "Use the <TAB> key to move from the input field to the buttons below it.",
 inputbox_instructions_string[] =
         "Please enter a string value. "
         "Use the <TAB> key to move from the input field to the buttons below it.",
 setmod_text[] =
         "This feature depends on another which has been configured as a module.\n"
         "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.  "
         "Accept the name shown to restore the configuration you "
         "last retrieved.  Leave blank to abort.",
 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"
         "If you are uncertain, then you have probably never used alternate\n"
         "configuration files.  You should therefor leave this blank to abort.\n",
 save_config_text[] =
         "Enter a filename to which this configuration should be saved "
         "as an alternate.  Leave blank to abort.",
 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"
         "Entering a file name here will allow you to later retrieve, modify\n"
         "and use the current configuration as an alternate to whatever\n"
         "configuration options you have selected at that time.\n"
         "\n"
         "If you are uncertain what all this means then you should probably\n"
         "leave this blank.\n"
 ;
 
 static char buf[4096], *bufptr = buf;
 static char input_buf[4096];
 static char *args[1024], **argptr = args;
 static int indent = 0;
 static int rows, cols;
 static struct menu *current_menu;
 static int child_count;
 static int do_resize;
 
 static void conf(struct menu *menu);
 static void conf_choice(struct menu *menu);
 static void conf_string(struct menu *menu);
 static void conf_load(void);
 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 cprint_init(void);
 static int cprint1(const char *fmt, ...);
 static void cprint_done(void);
 static int cprint(const char *fmt, ...);
 
 static void init_wsize(void)
 {
         struct winsize ws;
 
         if (ioctl(1, TIOCGWINSZ, &ws) == -1) {
                 rows = 24;
                 cols = 80;
         } else {
                 rows = ws.ws_row;
                 cols = ws.ws_col;
         }
 
         if (rows < 19 || cols < 80) {
                 fprintf(stderr, "Your display is too small to run Menuconfig!\n");
                 fprintf(stderr, "It must be at least 19 lines by 80 columns.\n");
                 exit(1);
         }
 
         rows -= 4;
         cols -= 5;
 }
 
 static void cprint_init(void)
 {
         bufptr = buf;
         argptr = args;
         memset(args, 0, sizeof(args));
         indent = 0;
         child_count = 0;
         cprint("./scripts/lxdialog/lxdialog");
         cprint("--backtitle");
         cprint(menu_backtitle);
 }
 
 static int cprint1(const char *fmt, ...)
 {
         va_list ap;
         int res;
 
         if (!*argptr)
                 *argptr = bufptr;
         va_start(ap, fmt);
         res = vsprintf(bufptr, fmt, ap);
         va_end(ap);
         bufptr += res;
 
         return res;
 }
 
 static void cprint_done(void)
 {
         *bufptr++ = 0;
         argptr++;
 }
 
 static int cprint(const char *fmt, ...)
 {
         va_list ap;
         int res;
 
         *argptr++ = bufptr;
         va_start(ap, fmt);
         res = vsprintf(bufptr, fmt, ap);
         va_end(ap);
         bufptr += res;
         *bufptr++ = 0;
 
         return res;
 }
 
 pid_t pid;
 
 static void winch_handler(int sig)
 {
         if (!do_resize) {
                 kill(pid, SIGINT);
                 do_resize = 1;
         }
 }
 
 static int exec_conf(void)
 {
         int pipefd[2], stat, size;
         struct sigaction sa;
         sigset_t sset, osset;
 
         sigemptyset(&sset);
         sigaddset(&sset, SIGINT);
         sigprocmask(SIG_BLOCK, &sset, &osset);
 
         signal(SIGINT, SIG_DFL);
 
         sa.sa_handler = winch_handler;
         sigemptyset(&sa.sa_mask);
         sa.sa_flags = SA_RESTART;
         sigaction(SIGWINCH, &sa, NULL);
 
         *argptr++ = NULL;
 
         pipe(pipefd);
         pid = fork();
         if (pid == 0) {
                 sigprocmask(SIG_SETMASK, &osset, NULL);
                 dup2(pipefd[1], 2);
                 close(pipefd[0]);
                 close(pipefd[1]);
                 execv(args[0], args);
                 _exit(EXIT_FAILURE);
         }
 
         close(pipefd[1]);
         bufptr = input_buf;
         while (1) {
                 size = input_buf + sizeof(input_buf) - bufptr;
                 size = read(pipefd[0], bufptr, size);
                 if (size <= 0) {
                         if (size < 0) {
                                 if (errno == EINTR || errno == EAGAIN)
                                         continue;
                                 perror("read");
                         }
                         break;
                 }
                 bufptr += size;
         }
         *bufptr++ = 0;
         close(pipefd[0]);
         waitpid(pid, &stat, 0);
 
         if (do_resize) {
                 init_wsize();
                 do_resize = 0;
                 sigprocmask(SIG_SETMASK, &osset, NULL);
                 return -1;
         }
         if (WIFSIGNALED(stat)) {
                 printf("\finterrupted(%d)\n", WTERMSIG(stat));
                 exit(1);
         }
 #if 0
         printf("\fexit state: %d\nexit data: '%s'\n", WEXITSTATUS(stat), input_buf);
         sleep(1);
 #endif
         sigpending(&sset);
         if (sigismember(&sset, SIGINT)) {
                 printf("\finterrupted\n");
                 exit(1);
         }
         sigprocmask(SIG_SETMASK, &osset, NULL);
 
         return WEXITSTATUS(stat);
 }
 
 static void build_conf(struct menu *menu)
 {
         struct symbol *sym;
         struct property *prop;
         struct menu *child;
         int type, tmp, doint = 2;
         tristate val;
         char ch;
 
         if (!menu_is_visible(menu))
                 return;
 
         sym = menu->sym;
         prop = menu->prompt;
         if (!sym) {
                 if (prop && menu != current_menu) {
                         const char *prompt = menu_get_prompt(menu);
                         switch (prop->type) {
                         case P_MENU:
                                 child_count++;
                                 cprint("m%p", menu);
                                 if (menu->parent != &rootmenu)
                                         cprint1("   %*c", indent + 1, ' ');
                                 cprint1("%s  --->", prompt);
                                 cprint_done();
                                 return;
                         default:
                                 if (prompt) {
                                         child_count++;
                                         cprint(":%p", menu);
                                         cprint("---%*c%s", indent + 1, ' ', prompt);
                                 }
                         }
                 } else
                         doint = 0;
                 goto conf_childs;
         }
 
         type = sym_get_type(sym);
         if (sym_is_choice(sym)) {
                 struct symbol *def_sym = sym_get_choice_value(sym);
                 struct menu *def_menu = NULL;
 
                 child_count++;
                 for (child = menu->list; child; child = child->next) {
                         if (menu_is_visible(child) && child->sym == def_sym)
                                 def_menu = child;
                 }
 
                 val = sym_get_tristate_value(sym);
                 if (sym_is_changable(sym)) {
                         cprint("t%p", menu);
                         switch (type) {
                         case S_BOOLEAN:
                                 cprint1("[%c]", val == no ? ' ' : '*');
                                 break;
                         case S_TRISTATE:
                                 switch (val) {
                                 case yes: ch = '*'; break;
                                 case mod: ch = 'M'; break;
                                 default:  ch = ' '; break;
                                 }
                                 cprint1("<%c>", ch);
                                 break;
                         }
                 } else {
                         cprint("%c%p", def_menu ? 't' : ':', menu);
                         cprint1("   ");
                 }
 
                 cprint1("%*c%s", indent + 1, ' ', menu_get_prompt(menu));
                 if (val == yes) {
                         if (def_menu) {
                                 cprint1(" (%s)", menu_get_prompt(def_menu));
                                 cprint1("  --->");
                                 cprint_done();
                                 if (def_menu->list) {
                                         indent += 2;
                                         build_conf(def_menu);
                                         indent -= 2;
                                 }
                         } else
                                 cprint_done();
                         return;
                 }
                 cprint_done();
         } else {
                 child_count++;
                 val = sym_get_tristate_value(sym);
                 if (sym_is_choice_value(sym) && val == yes) {
                         cprint(":%p", menu);
                         cprint1("   ");
                 } else {
                         switch (type) {
                         case S_BOOLEAN:
                                 cprint("t%p", menu);
                                 cprint1("[%c]", val == no ? ' ' : '*');
                                 break;
                         case S_TRISTATE:
                                 cprint("t%p", menu);
                                 switch (val) {
                                 case yes: ch = '*'; break;
                                 case mod: ch = 'M'; break;
                                 default:  ch = ' '; break;
                                 }
                                 cprint1("<%c>", ch);
                                 break;
                         default:
                                 cprint("s%p", menu);
                                 tmp = cprint1("(%s)", sym_get_string_value(sym));
                                 tmp = indent - tmp + 4;
                                 if (tmp < 0)
                                         tmp = 0;
                                 cprint1("%*c%s%s", tmp, ' ', menu_get_prompt(menu),
                                         sym_has_value(sym) ? "" : " (NEW)");
                                 cprint_done();
                                 goto conf_childs;
                         }
                 }
                 cprint1("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu),
                         sym_has_value(sym) ? "" : " (NEW)");
                 cprint_done();
         }
 
 conf_childs:
         indent += doint;
         for (child = menu->list; child; child = child->next)
                 build_conf(child);
         indent -= doint;
 }
 
 static void conf(struct menu *menu)
 {
         struct menu *submenu;
         const char *prompt = menu_get_prompt(menu);
         struct symbol *sym;
         char active_entry[40];
         int stat, type, i;
 
         active_entry[0] = 0;
         while (1) {
                 cprint_init();
                 cprint("--title");
                 cprint("%s", prompt ? prompt : "Main Menu");
                 cprint("--menu");
                 cprint(menu_instructions);
                 cprint("%d", rows);
                 cprint("%d", cols);
                 cprint("%d", rows - 10);
                 cprint("%s", active_entry);
                 current_menu = menu;
                 build_conf(menu);
                 if (!child_count)
                         break;
                 if (menu == &rootmenu) {
                         cprint(":");
                         cprint("--- ");
                         cprint("L");
                         cprint("Load an Alternate Configuration File");
                         cprint("S");
                         cprint("Save Configuration to an Alternate File");
                 }
                 stat = exec_conf();
                 if (stat < 0)
                         continue;
 
                 if (stat == 1 || stat == 255)
                         break;
 
                 type = input_buf[0];
                 if (!type)
                         continue;
 
                 for (i = 0; input_buf[i] && !isspace(input_buf[i]); i++)
                         ;
                 if (i >= sizeof(active_entry))
                         i = sizeof(active_entry) - 1;
                 input_buf[i] = 0;
                 strcpy(active_entry, input_buf);
 
                 sym = NULL;
                 submenu = NULL;
                 if (sscanf(input_buf + 1, "%p", &submenu) == 1)
                         sym = submenu->sym;
 
                 switch (stat) {
                 case 0:
                         switch (type) {
                         case 'm':
                                 conf(submenu);
                                 break;
                         case 't':
                                 if (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)
                                         conf_choice(submenu);
                                 break;
                         case 's':
                                 conf_string(submenu);
                                 break;
                         case 'L':
                                 conf_load();
                                 break;
                         case 'S':
                                 conf_save();
                                 break;
                         }
                         break;
                 case 2:
                         if (sym)
                                 show_help(submenu);
                         else
                                 show_readme();
                         break;
                 case 3:
                         if (type == 't') {
                                 if (sym_set_tristate_value(sym, yes))
                                         break;
                                 if (sym_set_tristate_value(sym, mod))
                                         show_textbox(NULL, setmod_text, 6, 74);
                         }
                         break;
                 case 4:
                         if (type == 't')
                                 sym_set_tristate_value(sym, no);
                         break;
                 case 5:
                         if (type == 't')
                                 sym_set_tristate_value(sym, mod);
                         break;
                 case 6:
                         if (type == 't')
                                 sym_toggle_tristate_value(sym);
                         break;
                 }
         }
 }
 
 static void show_textbox(const char *title, const char *text, int r, int c)
 {
         int fd;
 
         fd = creat(".help.tmp", 0777);
         write(fd, text, strlen(text));
         close(fd);
         do {
                 cprint_init();
                 if (title) {
                         cprint("--title");
                         cprint("%s", title);
                 }
                 cprint("--textbox");
                 cprint(".help.tmp");
                 cprint("%d", r);
                 cprint("%d", c);
         } while (exec_conf() < 0);
         unlink(".help.tmp");
 }
 
 static void show_helptext(const char *title, const char *text)
 {
         show_textbox(title, text, rows, cols);
 }
 
 static void show_help(struct menu *menu)
 {
         const char *help;
 
         help = menu->sym->help;
         if (!help)
                 help = nohelp_text;
         show_helptext(menu_get_prompt(menu), help);
 }
 
 static void show_readme(void)
 {
         do {
                 cprint_init();
                 cprint("--textbox");
                 cprint("scripts/README.Menuconfig");
                 cprint("%d", rows);
                 cprint("%d", cols);
         } while (exec_conf() == -1);
 }
 
 static void conf_choice(struct menu *menu)
 {
         const char *prompt = menu_get_prompt(menu);
         struct menu *child;
         struct symbol *active;
         int stat;
 
         while (1) {
                 cprint_init();
                 cprint("--title");
                 cprint("%s", prompt ? prompt : "Main Menu");
                 cprint("--radiolist");
                 cprint(radiolist_instructions);
                 cprint("15");
                 cprint("70");
                 cprint("6");
 
                 current_menu = menu;
                 active = sym_get_choice_value(menu->sym);
                 for (child = menu->list; child; child = child->next) {
                         if (!menu_is_visible(child))
                                 continue;
                         cprint("%p", child);
                         cprint("%s", menu_get_prompt(child));
                         cprint(child->sym == active ? "ON" : "OFF");
                 }
 
                 stat = exec_conf();
                 switch (stat) {
                 case 0:
                         if (sscanf(input_buf, "%p", &menu) != 1)
                                 break;
                         sym_set_tristate_value(menu->sym, yes);
                         return;
                 case 1:
                         show_help(menu);
                         break;
                 case 255:
                         return;
                 }
         }
 }
 
 static void conf_string(struct menu *menu)
 {
         const char *prompt = menu_get_prompt(menu);
         int stat;
 
         while (1) {
                 cprint_init();
                 cprint("--title");
                 cprint("%s", prompt ? prompt : "Main Menu");
                 cprint("--inputbox");
                 switch (sym_get_type(menu->sym)) {
                 case S_INT:
                         cprint(inputbox_instructions_int);
                         break;
                 case S_HEX:
                         cprint(inputbox_instructions_hex);
                         break;
                 case S_STRING:
                         cprint(inputbox_instructions_string);
                         break;
                 default:
                         /* panic? */;
                 }
                 cprint("10");
                 cprint("75");
                 cprint("%s", sym_get_string_value(menu->sym));
                 stat = exec_conf();
                 switch (stat) {
                 case 0:
                         if (sym_set_string_value(menu->sym, input_buf))
                                 return;
                         show_textbox(NULL, "You have made an invalid entry.", 5, 43);
                         break;
                 case 1:
                         show_help(menu);
                         break;
                 case 255:
                         return;
                 }
         }
 }
 
 static void conf_load(void)
 {
         int stat;
 
         while (1) {
                 cprint_init();
                 cprint("--inputbox");
                 cprint(load_config_text);
                 cprint("11");
                 cprint("55");
                 cprint("%s", conf_filename);
                 stat = exec_conf();
                 switch(stat) {
                 case 0:
                         if (!input_buf[0])
                                 return;
                         if (!conf_read(input_buf))
                                 return;
                         show_textbox(NULL, "File does not exist!", 5, 38);
                         break;
                 case 1:
                         show_helptext("Load Alternate Configuration", load_config_help);
                         break;
                 case 255:
                         return;
                 }
         }
 }
 
 static void conf_save(void)
 {
         int stat;
 
         while (1) {
                 cprint_init();
                 cprint("--inputbox");
                 cprint(save_config_text);
                 cprint("11");
                 cprint("55");
                 cprint("%s", conf_filename);
                 stat = exec_conf();
                 switch(stat) {
                 case 0:
                         if (!input_buf[0])
                                 return;
                         if (!conf_write(input_buf))
                                 return;
                         show_textbox(NULL, "Can't create file!  Probably a nonexistent directory.", 5, 60);
                         break;
                 case 1:
                         show_helptext("Save Alternate Configuration", save_config_help);
                         break;
                 case 255:
                         return;
                 }
         }
 }
 
 int main(int ac, char **av)
 {
         int stat;
         conf_parse(av[1]);
         conf_read(NULL);
 
         sprintf(menu_backtitle, "Configuration");
 
         init_wsize();
         conf(&rootmenu);
 
         do {
                 cprint_init();
                 cprint("--yesno");
                 cprint("Do you wish to save your new configuration?");
                 cprint("5");
                 cprint("60");
                 stat = exec_conf();
         } while (stat < 0);
 
         if (stat == 0) {
                 conf_write(NULL);
                 printf("\n\n"
                         "*** End of configuration.\n"
                         "*** Check the top-level Makefile for additional configuration.\n");
         } else
                 printf("\n\nYour configuration changes were NOT saved.\n\n");
 
         return 0;
 }
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 79cb983..c3f1bd0 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -1,651 +1,651 @@
 %{
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  * Released under the terms of the GNU GPL v2.0.
  */
 
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
 
 #define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt)
 
         #define PRINTD  0x0001
         #define DEBUG_PARSE0x0002
 
 int cdebug = PRINTD;
 
 extern int zconflex(void);
 static void zconfprint(const char *err, ...);
 static void zconferror(const char *err);
 static bool zconf_endtoken(int token, int starttoken, int endtoken);
 
 struct symbol *symbol_hash[257];
 
 #define YYERROR_VERBOSE
 %}
 %expect 36
 
 %union
 {
         int token;
         char *string;
         struct symbol *symbol;
         struct expr *expr;
         struct menu *menu;
 }
 
 %token T_MAINMENU
 %token T_MENU
 %token T_ENDMENU
 %token T_SOURCE
 %token T_CHOICE
 %token T_ENDCHOICE
 %token T_COMMENT
 %token T_CONFIG
 %token T_HELP
 %token <string> T_HELPTEXT
 %token T_IF
 %token T_ENDIF
 %token T_DEPENDS
 %token T_REQUIRES
 %token T_OPTIONAL
 %token T_PROMPT
 %token T_DEFAULT
 %token T_TRISTATE
 %token T_BOOLEAN
 %token T_INT
 %token T_HEX
 %token <string> T_WORD
 %token <string> T_STRING
 %token T_UNEQUAL
 %token T_EOF
 %token T_EOL
 %token T_CLOSE_PAREN
 %token T_OPEN_PAREN
 %token T_ON
 
 %left T_OR
 %left T_AND
 %left T_EQUAL T_UNEQUAL
 %nonassoc T_NOT
 
 %type <string> prompt
 %type <string> source
 %type <symbol> symbol
 %type <expr> expr
 %type <expr> if_expr
 %type <token> end
 
 %{
 #define LKC_DIRECT_LINK
 #include "lkc.h"
 %}
 %%
         input:  /* empty */
         | input block
 ;
 
         block:  common_block
         | choice_stmt
         | menu_stmt
         | T_MAINMENU prompt nl_or_eof
                 | T_ENDMENU     { zconfprint("unexpected 'endmenu' statement"); }
                 | T_ENDIF       { zconfprint("unexpected 'endif' statement"); }
                 | T_ENDCHOICE   { zconfprint("unexpected 'endchoice' statement"); }
                 | error nl_or_eof{ zconfprint("syntax error"); yyerrok; }
 ;
 
 common_block:
           if_stmt
         | comment_stmt
         | config_stmt
         | source_stmt
         | nl_or_eof
 ;
 
 
 /* config entry */
 
 config_entry_start: T_CONFIG T_WORD
 {
         struct symbol *sym = sym_lookup($2, 0);
         sym->flags |= SYMBOL_OPTIONAL;
         menu_add_entry(sym);
         printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), $2);
 };
 
 config_stmt: config_entry_start T_EOL config_option_list
 {
         menu_end_entry();
         printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
 };
 
 config_option_list:
           /* empty */
         | config_option_list config_option T_EOL
         | config_option_list depends T_EOL
         | config_option_list help
         | config_option_list T_EOL
 { };
 
 config_option: T_TRISTATE prompt_stmt_opt
 {
         menu_set_type(S_TRISTATE);
         printd(DEBUG_PARSE, "%s:%d:tristate\n", zconf_curname(), zconf_lineno());
 };
 
 config_option: T_BOOLEAN prompt_stmt_opt
 {
         menu_set_type(S_BOOLEAN);
         printd(DEBUG_PARSE, "%s:%d:boolean\n", zconf_curname(), zconf_lineno());
 };
 
 config_option: T_INT prompt_stmt_opt
 {
         menu_set_type(S_INT);
         printd(DEBUG_PARSE, "%s:%d:int\n", zconf_curname(), zconf_lineno());
 };
 
 config_option: T_HEX prompt_stmt_opt
 {
         menu_set_type(S_HEX);
         printd(DEBUG_PARSE, "%s:%d:hex\n", zconf_curname(), zconf_lineno());
 };
 
 config_option: T_STRING prompt_stmt_opt
 {
         menu_set_type(S_STRING);
         printd(DEBUG_PARSE, "%s:%d:string\n", zconf_curname(), zconf_lineno());
 };
 
 config_option: T_PROMPT prompt if_expr
 {
         menu_add_prop(P_PROMPT, $2, NULL, $3);
         printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
 };
 
 config_option: T_DEFAULT symbol if_expr
 {
         menu_add_prop(P_DEFAULT, NULL, $2, $3);
         printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno());
 };
 
 /* choice entry */
 
 choice: T_CHOICE
 {
         struct symbol *sym = sym_lookup(NULL, 0);
         sym->flags |= SYMBOL_CHOICE;
         menu_add_entry(sym);
         menu_add_prop(P_CHOICE, NULL, NULL, NULL);
         printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
 };
 
 choice_entry: choice T_EOL choice_option_list
 {
         menu_end_entry();
         menu_add_menu();
 };
 
 choice_end: end
 {
         if (zconf_endtoken($1, T_CHOICE, T_ENDCHOICE)) {
                 menu_end_menu();
                 printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(), zconf_lineno());
         }
 };
 
 choice_stmt:
           choice_entry choice_block choice_end T_EOL
         | choice_entry choice_block
 {
         printf("%s:%d: missing 'endchoice' for this 'choice' statement\n", current_menu->file->name, current_menu->lineno);
         zconfnerrs++;
 };
 
 choice_option_list:
           /* empty */
         | choice_option_list choice_option T_EOL
         | choice_option_list depends T_EOL
         | choice_option_list help
         | choice_option_list T_EOL
 ;
 
 choice_option: T_PROMPT prompt if_expr
 {
         menu_add_prop(P_PROMPT, $2, NULL, $3);
         printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
 };
 
 choice_option: T_OPTIONAL
 {
         current_entry->sym->flags |= SYMBOL_OPTIONAL;
         printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno());
 };
 
 choice_option: T_DEFAULT symbol
 {
         menu_add_prop(P_DEFAULT, NULL, $2, NULL);
         //current_choice->prop->def = $2;
         printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno());
 };
 
 choice_block:
           /* empty */
         | choice_block common_block
 ;
 
 /* if entry */
 
 if: T_IF expr
 {
         printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
         menu_add_entry(NULL);
         //current_entry->prompt = menu_add_prop(T_IF, NULL, NULL, $2);
         menu_add_dep($2);
         menu_end_entry();
         menu_add_menu();
 };
 
 if_end: end
 {
         if (zconf_endtoken($1, T_IF, T_ENDIF)) {
                 menu_end_menu();
                 printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(), zconf_lineno());
         }
 };
 
 if_stmt:
           if T_EOL if_block if_end T_EOL
         | if T_EOL if_block
 {
         printf("%s:%d: missing 'endif' for this 'if' statement\n", current_menu->file->name, current_menu->lineno);
         zconfnerrs++;
 };
 
 if_block:
           /* empty */
         | if_block common_block
         | if_block menu_stmt
         | if_block choice_stmt
 ;
 
 /* menu entry */
 
 menu: T_MENU prompt
 {
         menu_add_entry(NULL);
         menu_add_prop(P_MENU, $2, NULL, NULL);
         printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
 };
 
 menu_entry: menu T_EOL depends_list
 {
         menu_end_entry();
         menu_add_menu();
 };
 
 menu_end: end
 {
         if (zconf_endtoken($1, T_MENU, T_ENDMENU)) {
                 menu_end_menu();
                 printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(), zconf_lineno());
         }
 };
 
 menu_stmt:
           menu_entry menu_block menu_end T_EOL
         | menu_entry menu_block
 {
         printf("%s:%d: missing 'endmenu' for this 'menu' statement\n", current_menu->file->name, current_menu->lineno);
         zconfnerrs++;
 };
 
 menu_block:
           /* empty */
         | menu_block common_block
         | menu_block menu_stmt
         | menu_block choice_stmt
                 | menu_block error T_EOL        { zconfprint("invalid menu option"); yyerrok; }
 ;
 
 source: T_SOURCE prompt
 {
         $$ = $2;
         printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), $2);
 };
 
 source_stmt: source T_EOL
 {
         zconf_nextfile($1);
 };
 
 /* comment entry */
 
 comment: T_COMMENT prompt
 {
         menu_add_entry(NULL);
         menu_add_prop(P_COMMENT, $2, NULL, NULL);
         printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
 };
 
 comment_stmt: comment T_EOL depends_list
 {
         menu_end_entry();
 };
 
 /* help option */
 
 help_start: T_HELP T_EOL
 {
         printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno());
         zconf_starthelp();
 };
 
 help: help_start T_HELPTEXT
 {
         current_entry->sym->help = $2;
 };
 
 /* depends option */
 
         depends_list:  /* empty */
                 | depends_list depends T_EOL
                 | depends_list T_EOL
 { };
 
 depends: T_DEPENDS T_ON expr
 {
         menu_add_dep($3);
         printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno());
 }
         | T_DEPENDS expr
 {
         menu_add_dep($2);
         printd(DEBUG_PARSE, "%s:%d:depends\n", zconf_curname(), zconf_lineno());
 }
         | T_REQUIRES expr
 {
         menu_add_dep($2);
         printd(DEBUG_PARSE, "%s:%d:requires\n", zconf_curname(), zconf_lineno());
 };
 
 /* prompt statement */
 
 prompt_stmt_opt:
           /* empty */
         | prompt
 {
         menu_add_prop(P_PROMPT, $1, NULL, NULL);
 }
         | prompt T_IF expr
 {
         menu_add_prop(P_PROMPT, $1, NULL, $3);
 };
 
         prompt:  T_WORD
         | T_STRING
 ;
 
         end:      T_ENDMENU     { $$ = T_ENDMENU; }
                 | T_ENDCHOICE   { $$ = T_ENDCHOICE; }
                 | T_ENDIF       { $$ = T_ENDIF; }
 ;
 
 nl_or_eof:
         T_EOL | T_EOF;
 
         if_expr:  /* empty */           { $$ = NULL; }
                 | T_IF expr             { $$ = $2; }
 ;
 
         expr:     symbol                        { $$ = expr_alloc_symbol($1); }
                 | symbol T_EQUAL symbol                 { $$ = expr_alloc_comp(E_EQUAL, $1, $3); }
                 | symbol T_UNEQUAL symbol       { $$ = expr_alloc_comp(E_UNEQUAL, $1, $3); }
                 | T_OPEN_PAREN expr T_CLOSE_PAREN{ $$ = $2; }
                 | T_NOT expr                    { $$ = expr_alloc_one(E_NOT, $2); }
                 | expr T_OR expr                { $$ = expr_alloc_two(E_OR, $1, $3); }
                 | expr T_AND expr               { $$ = expr_alloc_two(E_AND, $1, $3); }
 ;
 
         symbol:           T_WORD{ $$ = sym_lookup($1, 0); free($1); }
                 | T_STRING{ $$ = sym_lookup($1, 1); free($1); }
 ;
 
 %%
 
 void conf_parse(const char *name)
 {
         zconf_initscan(name);
 
         sym_init();
         menu_init();
-        rootmenu.prompt = menu_add_prop(P_MENU, "Linux Kernel Configuration", NULL, NULL);
+        rootmenu.prompt = menu_add_prop(P_MENU, "Configuration", NULL, NULL);
 
         //zconfdebug = 1;
         zconfparse();
         if (zconfnerrs)
                 exit(1);
         menu_finalize(&rootmenu);
 
         modules_sym = sym_lookup("MODULES", 0);
 
         sym_change_count = 1;
 }
 
 const char *zconf_tokenname(int token)
 {
         switch (token) {
                 case T_MENU:    return "menu";
                 case T_ENDMENU:         return "endmenu";
                 case T_CHOICE:  return "choice";
                 case T_ENDCHOICE:return "endchoice";
                 case T_IF:      return "if";
                 case T_ENDIF:   return "endif";
         }
         return "<token>";
 } 
 
 static bool zconf_endtoken(int token, int starttoken, int endtoken)
 {
         if (token != endtoken) {
                 zconfprint("unexpected '%s' within %s block", zconf_tokenname(token), zconf_tokenname(starttoken));
                 zconfnerrs++;
                 return false;
         }
         if (current_menu->file != current_file) {
                 zconfprint("'%s' in different file than '%s'", zconf_tokenname(token), zconf_tokenname(starttoken));
                 zconfprint("location of the '%s'", zconf_tokenname(starttoken));
                 zconfnerrs++;
                 return false;
         }
         return true;
 }
 
 static void zconfprint(const char *err, ...)
 {
         va_list ap;
 
         fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno());
         va_start(ap, err);
         vfprintf(stderr, err, ap);
         va_end(ap);
         fprintf(stderr, "\n");
 }
 
 static void zconferror(const char *err)
 {
         fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno(), err);
 }
 
 void print_quoted_string(FILE *out, const char *str)
 {
         const char *p;
         int len;
 
         putc('"', out);
         while ((p = strchr(str, '"'))) {
                 len = p - str;
                 if (len)
                         fprintf(out, "%.*s", len, str);
                 fputs("\\\"", out);
                 str = p + 1;
         }
         fputs(str, out);
         putc('"', out);
 }
 
 void print_symbol(FILE *out, struct menu *menu)
 {
         struct symbol *sym = menu->sym;
         struct property *prop;
 
         //sym->flags |= SYMBOL_PRINTED;
 
         if (sym_is_choice(sym))
                 fprintf(out, "choice\n");
         else
                 fprintf(out, "config %s\n", sym->name);
         switch (sym->type) {
         case S_BOOLEAN:
                 fputs("  boolean\n", out);
                 break;
         case S_TRISTATE:
                 fputs("  tristate\n", out);
                 break;
         case S_STRING:
                 fputs("  string\n", out);
                 break;
         case S_INT:
                 fputs("  integer\n", out);
                 break;
         case S_HEX:
                 fputs("  hex\n", out);
                 break;
         default:
                 fputs("  ???\n", out);
                 break;
         }
 #if 0
         if (!expr_is_yes(sym->dep)) {
                 fputs("  depends ", out);
                 expr_fprint(sym->dep, out);
                 fputc('\n', out);
         }
 #endif
         for (prop = sym->prop; prop; prop = prop->next) {
                 if (prop->menu != menu)
                         continue;
                 switch (prop->type) {
                 case P_PROMPT:
                         fputs("  prompt ", out);
                         print_quoted_string(out, prop->text);
                         if (prop->def) {
                                 fputc(' ', out);
                                 if (prop->def->flags & SYMBOL_CONST)
                                         print_quoted_string(out, prop->def->name);
                                 else
                                         fputs(prop->def->name, out);
                         }
                         if (!expr_is_yes(E_EXPR(prop->visible))) {
                                 fputs(" if ", out);
                                 expr_fprint(E_EXPR(prop->visible), out);
                         }
                         fputc('\n', out);
                         break;
                 case P_DEFAULT:
                         fputs( "  default ", out);
                         print_quoted_string(out, prop->def->name);
                         if (!expr_is_yes(E_EXPR(prop->visible))) {
                                 fputs(" if ", out);
                                 expr_fprint(E_EXPR(prop->visible), out);
                         }
                         fputc('\n', out);
                         break;
                 case P_CHOICE:
                         fputs("  #choice value\n", out);
                         break;
                 default:
                         fprintf(out, "  unknown prop %d!\n", prop->type);
                         break;
                 }
         }
         if (sym->help) {
                 int len = strlen(sym->help);
                 while (sym->help[--len] == '\n')
                         sym->help[len] = 0;
                 fprintf(out, "  help\n%s\n", sym->help);
         }
         fputc('\n', out);
 }
 
 void zconfdump(FILE *out)
 {
         //struct file *file;
         struct property *prop;
         struct symbol *sym;
         struct menu *menu;
 
         menu = rootmenu.list;
         while (menu) {
                 if ((sym = menu->sym))
                         print_symbol(out, menu);
                 else if ((prop = menu->prompt)) {
                         switch (prop->type) {
                         //case T_MAINMENU:
                                 //fputs("\nmainmenu ", out);
                                 //print_quoted_string(out, prop->text);
                                 //fputs("\n", out);
                                 //break;
                         case P_COMMENT:
                                 fputs("\ncomment ", out);
                                 print_quoted_string(out, prop->text);
                                 fputs("\n", out);
                                 break;
                         case P_MENU:
                                 fputs("\nmenu ", out);
                                 print_quoted_string(out, prop->text);
                                 fputs("\n", out);
                                 break;
                         //case T_SOURCE:
                                 //fputs("\nsource ", out);
                                 //print_quoted_string(out, prop->text);
                                 //fputs("\n", out);
                                 //break;
                         //case T_IF:
                                 //fputs("\nif\n", out);
                         default:
                                 ;
                         }
                         if (!expr_is_yes(E_EXPR(prop->visible))) {
                                 fputs("  depends ", out);
                                 expr_fprint(E_EXPR(prop->visible), out);
                                 fputc('\n', out);
                         }
                         fputs("\n", out);
                 }
 
                 if (menu->list)
                         menu = menu->list;
                 else if (menu->next)
                         menu = menu->next;
                 else while ((menu = menu->parent)) {
                         if (menu->prompt && menu->prompt->type == P_MENU)
                                 fputs("\nendmenu\n", out);
                         if (menu->next) {
                                 menu = menu->next;
                                 break;
                         }
                 }
         }
 }
 
 #include "lex.zconf.c"
 #include "confdata.c"
 #include "expr.c"
 #include "symbol.c"
 #include "menu.c"