-rw-r--r-- | scripts/kconfig/mconf.c | 8 | ||||
-rw-r--r-- | scripts/kconfig/zconf.y | 2 |
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 | |||
@@ -15,86 +15,86 @@ | |||
15 | #include <unistd.h> | 15 | #include <unistd.h> |
16 | 16 | ||
17 | #define LKC_DIRECT_LINK | 17 | #define LKC_DIRECT_LINK |
18 | #include "lkc.h" | 18 | #include "lkc.h" |
19 | 19 | ||
20 | static char menu_backtitle[128]; | 20 | static char menu_backtitle[128]; |
21 | static const char menu_instructions[] = | 21 | static const char menu_instructions[] = |
22 | "Arrow keys navigate the menu. " | 22 | "Arrow keys navigate the menu. " |
23 | "<Enter> selects submenus --->. " | 23 | "<Enter> selects submenus --->. " |
24 | "Highlighted letters are hotkeys. " | 24 | "Highlighted letters are hotkeys. " |
25 | "Pressing <Y> includes, <N> excludes, <M> modularizes features. " | 25 | "Pressing <Y> includes, <N> excludes, <M> modularizes features. " |
26 | "Press <Esc><Esc> to exit, <?> for Help. " | 26 | "Press <Esc><Esc> to exit, <?> for Help. " |
27 | "Legend: [*] built-in [ ] excluded <M> module < > module capable", | 27 | "Legend: [*] built-in [ ] excluded <M> module < > module capable", |
28 | radiolist_instructions[] = | 28 | radiolist_instructions[] = |
29 | "Use the arrow keys to navigate this window or " | 29 | "Use the arrow keys to navigate this window or " |
30 | "press the hotkey of the item you wish to select " | 30 | "press the hotkey of the item you wish to select " |
31 | "followed by the <SPACE BAR>. " | 31 | "followed by the <SPACE BAR>. " |
32 | "Press <?> for additional information about this option.", | 32 | "Press <?> for additional information about this option.", |
33 | inputbox_instructions_int[] = | 33 | inputbox_instructions_int[] = |
34 | "Please enter a decimal value. " | 34 | "Please enter a decimal value. " |
35 | "Fractions will not be accepted. " | 35 | "Fractions will not be accepted. " |
36 | "Use the <TAB> key to move from the input field to the buttons below it.", | 36 | "Use the <TAB> key to move from the input field to the buttons below it.", |
37 | inputbox_instructions_hex[] = | 37 | inputbox_instructions_hex[] = |
38 | "Please enter a hexadecimal value. " | 38 | "Please enter a hexadecimal value. " |
39 | "Use the <TAB> key to move from the input field to the buttons below it.", | 39 | "Use the <TAB> key to move from the input field to the buttons below it.", |
40 | inputbox_instructions_string[] = | 40 | inputbox_instructions_string[] = |
41 | "Please enter a string value. " | 41 | "Please enter a string value. " |
42 | "Use the <TAB> key to move from the input field to the buttons below it.", | 42 | "Use the <TAB> key to move from the input field to the buttons below it.", |
43 | setmod_text[] = | 43 | setmod_text[] = |
44 | "This feature depends on another which has been configured as a module.\n" | 44 | "This feature depends on another which has been configured as a module.\n" |
45 | "As a result, this feature will be built as a module.", | 45 | "As a result, this feature will be built as a module.", |
46 | nohelp_text[] = | 46 | nohelp_text[] = |
47 | "There is no help available for this kernel option.\n", | 47 | "There is no help available for this option.\n", |
48 | load_config_text[] = | 48 | load_config_text[] = |
49 | "Enter the name of the configuration file you wish to load. " | 49 | "Enter the name of the configuration file you wish to load. " |
50 | "Accept the name shown to restore the configuration you " | 50 | "Accept the name shown to restore the configuration you " |
51 | "last retrieved. Leave blank to abort.", | 51 | "last retrieved. Leave blank to abort.", |
52 | load_config_help[] = | 52 | load_config_help[] = |
53 | "\n" | 53 | "\n" |
54 | "For various reasons, one may wish to keep several different kernel\n" | 54 | "For various reasons, one may wish to keep several different\n" |
55 | "configurations available on a single machine.\n" | 55 | "configurations available on a single machine.\n" |
56 | "\n" | 56 | "\n" |
57 | "If you have saved a previous configuration in a file other than the\n" | 57 | "If you have saved a previous configuration in a file other than the\n" |
58 | "kernel's default, entering the name of the file here will allow you\n" | 58 | "default, entering the name of the file here will allow you\n" |
59 | "to modify that configuration.\n" | 59 | "to modify that configuration.\n" |
60 | "\n" | 60 | "\n" |
61 | "If you are uncertain, then you have probably never used alternate\n" | 61 | "If you are uncertain, then you have probably never used alternate\n" |
62 | "configuration files. You should therefor leave this blank to abort.\n", | 62 | "configuration files. You should therefor leave this blank to abort.\n", |
63 | save_config_text[] = | 63 | save_config_text[] = |
64 | "Enter a filename to which this configuration should be saved " | 64 | "Enter a filename to which this configuration should be saved " |
65 | "as an alternate. Leave blank to abort.", | 65 | "as an alternate. Leave blank to abort.", |
66 | save_config_help[] = | 66 | save_config_help[] = |
67 | "\n" | 67 | "\n" |
68 | "For various reasons, one may wish to keep different kernel\n" | 68 | "For various reasons, one may wish to keep different\n" |
69 | "configurations available on a single machine.\n" | 69 | "configurations available on a single machine.\n" |
70 | "\n" | 70 | "\n" |
71 | "Entering a file name here will allow you to later retrieve, modify\n" | 71 | "Entering a file name here will allow you to later retrieve, modify\n" |
72 | "and use the current configuration as an alternate to whatever\n" | 72 | "and use the current configuration as an alternate to whatever\n" |
73 | "configuration options you have selected at that time.\n" | 73 | "configuration options you have selected at that time.\n" |
74 | "\n" | 74 | "\n" |
75 | "If you are uncertain what all this means then you should probably\n" | 75 | "If you are uncertain what all this means then you should probably\n" |
76 | "leave this blank.\n" | 76 | "leave this blank.\n" |
77 | ; | 77 | ; |
78 | 78 | ||
79 | static char buf[4096], *bufptr = buf; | 79 | static char buf[4096], *bufptr = buf; |
80 | static char input_buf[4096]; | 80 | static char input_buf[4096]; |
81 | static char *args[1024], **argptr = args; | 81 | static char *args[1024], **argptr = args; |
82 | static int indent = 0; | 82 | static int indent = 0; |
83 | static int rows, cols; | 83 | static int rows, cols; |
84 | static struct menu *current_menu; | 84 | static struct menu *current_menu; |
85 | static int child_count; | 85 | static int child_count; |
86 | static int do_resize; | 86 | static int do_resize; |
87 | 87 | ||
88 | static void conf(struct menu *menu); | 88 | static void conf(struct menu *menu); |
89 | static void conf_choice(struct menu *menu); | 89 | static void conf_choice(struct menu *menu); |
90 | static void conf_string(struct menu *menu); | 90 | static void conf_string(struct menu *menu); |
91 | static void conf_load(void); | 91 | static void conf_load(void); |
92 | static void conf_save(void); | 92 | static void conf_save(void); |
93 | static void show_textbox(const char *title, const char *text, int r, int c); | 93 | static void show_textbox(const char *title, const char *text, int r, int c); |
94 | static void show_helptext(const char *title, const char *text); | 94 | static void show_helptext(const char *title, const char *text); |
95 | static void show_help(struct menu *menu); | 95 | static void show_help(struct menu *menu); |
96 | static void show_readme(void); | 96 | static void show_readme(void); |
97 | 97 | ||
98 | static void cprint_init(void); | 98 | static void cprint_init(void); |
99 | static int cprint1(const char *fmt, ...); | 99 | static int cprint1(const char *fmt, ...); |
100 | static void cprint_done(void); | 100 | static void cprint_done(void); |
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 | |||
@@ -395,65 +395,65 @@ end: T_ENDMENU { $$ = T_ENDMENU; } | |||
395 | | T_ENDCHOICE { $$ = T_ENDCHOICE; } | 395 | | T_ENDCHOICE { $$ = T_ENDCHOICE; } |
396 | | T_ENDIF { $$ = T_ENDIF; } | 396 | | T_ENDIF { $$ = T_ENDIF; } |
397 | ; | 397 | ; |
398 | 398 | ||
399 | nl_or_eof: | 399 | nl_or_eof: |
400 | T_EOL | T_EOF; | 400 | T_EOL | T_EOF; |
401 | 401 | ||
402 | if_expr: /* empty */ { $$ = NULL; } | 402 | if_expr: /* empty */ { $$ = NULL; } |
403 | | T_IF expr { $$ = $2; } | 403 | | T_IF expr { $$ = $2; } |
404 | ; | 404 | ; |
405 | 405 | ||
406 | expr: symbol { $$ = expr_alloc_symbol($1); } | 406 | expr: symbol { $$ = expr_alloc_symbol($1); } |
407 | | symbol T_EQUAL symbol { $$ = expr_alloc_comp(E_EQUAL, $1, $3); } | 407 | | symbol T_EQUAL symbol { $$ = expr_alloc_comp(E_EQUAL, $1, $3); } |
408 | | symbol T_UNEQUAL symbol { $$ = expr_alloc_comp(E_UNEQUAL, $1, $3); } | 408 | | symbol T_UNEQUAL symbol { $$ = expr_alloc_comp(E_UNEQUAL, $1, $3); } |
409 | | T_OPEN_PAREN expr T_CLOSE_PAREN{ $$ = $2; } | 409 | | T_OPEN_PAREN expr T_CLOSE_PAREN{ $$ = $2; } |
410 | | T_NOT expr { $$ = expr_alloc_one(E_NOT, $2); } | 410 | | T_NOT expr { $$ = expr_alloc_one(E_NOT, $2); } |
411 | | expr T_OR expr { $$ = expr_alloc_two(E_OR, $1, $3); } | 411 | | expr T_OR expr { $$ = expr_alloc_two(E_OR, $1, $3); } |
412 | | expr T_AND expr { $$ = expr_alloc_two(E_AND, $1, $3); } | 412 | | expr T_AND expr { $$ = expr_alloc_two(E_AND, $1, $3); } |
413 | ; | 413 | ; |
414 | 414 | ||
415 | symbol: T_WORD{ $$ = sym_lookup($1, 0); free($1); } | 415 | symbol: T_WORD{ $$ = sym_lookup($1, 0); free($1); } |
416 | | T_STRING{ $$ = sym_lookup($1, 1); free($1); } | 416 | | T_STRING{ $$ = sym_lookup($1, 1); free($1); } |
417 | ; | 417 | ; |
418 | 418 | ||
419 | %% | 419 | %% |
420 | 420 | ||
421 | void conf_parse(const char *name) | 421 | void conf_parse(const char *name) |
422 | { | 422 | { |
423 | zconf_initscan(name); | 423 | zconf_initscan(name); |
424 | 424 | ||
425 | sym_init(); | 425 | sym_init(); |
426 | menu_init(); | 426 | menu_init(); |
427 | rootmenu.prompt = menu_add_prop(P_MENU, "Linux Kernel Configuration", NULL, NULL); | 427 | rootmenu.prompt = menu_add_prop(P_MENU, "Configuration", NULL, NULL); |
428 | 428 | ||
429 | //zconfdebug = 1; | 429 | //zconfdebug = 1; |
430 | zconfparse(); | 430 | zconfparse(); |
431 | if (zconfnerrs) | 431 | if (zconfnerrs) |
432 | exit(1); | 432 | exit(1); |
433 | menu_finalize(&rootmenu); | 433 | menu_finalize(&rootmenu); |
434 | 434 | ||
435 | modules_sym = sym_lookup("MODULES", 0); | 435 | modules_sym = sym_lookup("MODULES", 0); |
436 | 436 | ||
437 | sym_change_count = 1; | 437 | sym_change_count = 1; |
438 | } | 438 | } |
439 | 439 | ||
440 | const char *zconf_tokenname(int token) | 440 | const char *zconf_tokenname(int token) |
441 | { | 441 | { |
442 | switch (token) { | 442 | switch (token) { |
443 | case T_MENU: return "menu"; | 443 | case T_MENU: return "menu"; |
444 | case T_ENDMENU: return "endmenu"; | 444 | case T_ENDMENU: return "endmenu"; |
445 | case T_CHOICE: return "choice"; | 445 | case T_CHOICE: return "choice"; |
446 | case T_ENDCHOICE:return "endchoice"; | 446 | case T_ENDCHOICE:return "endchoice"; |
447 | case T_IF: return "if"; | 447 | case T_IF: return "if"; |
448 | case T_ENDIF: return "endif"; | 448 | case T_ENDIF: return "endif"; |
449 | } | 449 | } |
450 | return "<token>"; | 450 | return "<token>"; |
451 | } | 451 | } |
452 | 452 | ||
453 | static bool zconf_endtoken(int token, int starttoken, int endtoken) | 453 | static bool zconf_endtoken(int token, int starttoken, int endtoken) |
454 | { | 454 | { |
455 | if (token != endtoken) { | 455 | if (token != endtoken) { |
456 | zconfprint("unexpected '%s' within %s block", zconf_tokenname(token), zconf_tokenname(starttoken)); | 456 | zconfprint("unexpected '%s' within %s block", zconf_tokenname(token), zconf_tokenname(starttoken)); |
457 | zconfnerrs++; | 457 | zconfnerrs++; |
458 | return false; | 458 | return false; |
459 | } | 459 | } |