Remove kernel references

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,260 +1,260 @@
 /*
  * 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;
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
@@ -235,385 +235,385 @@ choice_option: T_DEFAULT symbol
 };
 
 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: