OpenWrt – Diff between revs 2 and 3
?pathlinks?
| Rev 2 | Rev 3 | |||
|---|---|---|---|---|
| Line 73... | Line 73... | |||
| 73 | } |
73 | } |
|
| Line 74... | Line 74... | |||
| 74 | |
74 | |
|
| 75 | static void check_stdin(void) |
75 | static void check_stdin(void) |
|
| 76 | { |
76 | { |
|
| 77 | if (!valid_stdin) { |
77 | if (!valid_stdin) { |
|
| 78 | printf("%s",_("aborted!\n\n")); |
78 | printf(_("aborted!\n\n")); |
|
| 79 | printf("%s",_("Console input/output is redirected. ")); |
79 | printf(_("Console input/output is redirected. ")); |
|
| 80 | printf("%s",_("Run 'make oldconfig' to update configuration.\n\n")); |
80 | printf(_("Run 'make oldconfig' to update configuration.\n\n")); |
|
| 81 | exit(1); |
81 | exit(1); |
|
| 82 | } |
82 | } |
|
| Line 83... | Line 83... | |||
| 83 | } |
83 | } |
|
| 84 | |
84 | |
|
| 85 | static int conf_askvalue(struct symbol *sym, const char *def) |
85 | static int conf_askvalue(struct symbol *sym, const char *def) |
|
| Line 86... | Line 86... | |||
| 86 | { |
86 | { |
|
| 87 | enum symbol_type type = sym_get_type(sym); |
87 | enum symbol_type type = sym_get_type(sym); |
|
| Line 88... | Line 88... | |||
| 88 | |
88 | |
|
| 89 | if (!sym_has_value(sym)) |
89 | if (!sym_has_value(sym)) |
|
| Line 90... | Line 90... | |||
| 90 | printf("%s",_("(NEW) ")); |
90 | printf(_("(NEW) ")); |
|
| Line 286... | Line 286... | |||
| 286 | printf("%*c", indent, ' '); |
286 | printf("%*c", indent, ' '); |
|
| 287 | printf(" %d. %s", cnt, _(menu_get_prompt(child))); |
287 | printf(" %d. %s", cnt, _(menu_get_prompt(child))); |
|
| 288 | if (child->sym->name) |
288 | if (child->sym->name) |
|
| 289 | printf(" (%s)", child->sym->name); |
289 | printf(" (%s)", child->sym->name); |
|
| 290 | if (!sym_has_value(child->sym)) |
290 | if (!sym_has_value(child->sym)) |
|
| 291 | printf("%s",_(" (NEW)")); |
291 | printf(_(" (NEW)")); |
|
| 292 | printf("\n"); |
292 | printf("\n"); |
|
| 293 | } |
293 | } |
|
| 294 | printf(_("%*schoice"), indent - 1, ""); |
294 | printf(_("%*schoice"), indent - 1, ""); |
|
| 295 | if (cnt == 1) { |
295 | if (cnt == 1) { |
|
| 296 | printf("[1]: 1\n"); |
296 | printf("[1]: 1\n"); |
|
| Line 434... | Line 434... | |||
| 434 | if (sym->name && !sym_is_choice_value(sym)) { |
434 | if (sym->name && !sym_is_choice_value(sym)) { |
|
| 435 | printf("%s%s\n", CONFIG_, sym->name); |
435 | printf("%s%s\n", CONFIG_, sym->name); |
|
| 436 | } |
436 | } |
|
| 437 | } else if (input_mode != olddefconfig) { |
437 | } else if (input_mode != olddefconfig) { |
|
| 438 | if (!conf_cnt++) |
438 | if (!conf_cnt++) |
|
| 439 | printf("%s",_("*\n* Restart config...\n*\n")); |
439 | printf(_("*\n* Restart config...\n*\n")); |
|
| 440 | rootEntry = menu_get_parent_menu(menu); |
440 | rootEntry = menu_get_parent_menu(menu); |
|
| 441 | conf(rootEntry); |
441 | conf(rootEntry); |
|
| 442 | } |
442 | } |
|
| 443 | } |
443 | } |
|
| 444 | } |
444 | } |
|