projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: remove string expansion in file_lookup()
[carl9170fw.git]
/
config
/
zconf.y
diff --git
a/config/zconf.y
b/config/zconf.y
index 1aa9859726b365f732787d54d350d560c8a94f1a..c02e5c39f4ea162646f5524fcfb1284efe788ccc 100644
(file)
--- a/
config/zconf.y
+++ b/
config/zconf.y
@@
-127,7
+127,7
@@
no_mainmenu_stmt: /* empty */
* later regardless of whether it comes from the 'prompt' in
* mainmenu_stmt or here
*/
* later regardless of whether it comes from the 'prompt' in
* mainmenu_stmt or here
*/
- menu_add_prompt(P_MENU, strdup("Linux Kernel Configuration"), NULL);
+ menu_add_prompt(P_MENU,
x
strdup("Linux Kernel Configuration"), NULL);
};
};
@@
-276,6
+276,7
@@
choice: T_CHOICE word_opt T_EOL
sym->flags |= SYMBOL_AUTO;
menu_add_entry(sym);
menu_add_expr(P_CHOICE, NULL, NULL);
sym->flags |= SYMBOL_AUTO;
menu_add_entry(sym);
menu_add_expr(P_CHOICE, NULL, NULL);
+ free($2);
printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
};
printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
};
@@
-436,6
+437,12
@@
help: help_start T_HELPTEXT
zconfprint("warning: '%s' defined with more than one help text -- only the last one will be used",
current_entry->sym->name ?: "<choice>");
}
zconfprint("warning: '%s' defined with more than one help text -- only the last one will be used",
current_entry->sym->name ?: "<choice>");
}
+
+ /* Is the help text empty or all whitespace? */
+ if ($2[strspn($2, " \f\n\r\t\v")] == '\0')
+ zconfprint("warning: '%s' defined with blank help text",
+ current_entry->sym->name ?: "<choice>");
+
current_entry->help = $2;
};
current_entry->help = $2;
};
@@
-527,7
+534,6
@@
void conf_parse(const char *name)
zconf_initscan(name);
zconf_initscan(name);
- sym_init();
_menu_init();
rootmenu.prompt = menu_add_prompt(P_MENU, "CARL9170 Firmware Configuration", NULL);
_menu_init();
rootmenu.prompt = menu_add_prompt(P_MENU, "CARL9170 Firmware Configuration", NULL);
@@
-540,7
+546,7
@@
void conf_parse(const char *name)
modules_sym = sym_find( "n" );
tmp = rootmenu.prompt->text;
modules_sym = sym_find( "n" );
tmp = rootmenu.prompt->text;
- rootmenu.prompt->text =
_(rootmenu.prompt->text)
;
+ rootmenu.prompt->text =
rootmenu.prompt->text
;
rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
free((char*)tmp);
rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
free((char*)tmp);
@@
-774,3
+780,4
@@
void zconfdump(FILE *out)
#include "expr.c"
#include "symbol.c"
#include "menu.c"
#include "expr.c"
#include "symbol.c"
#include "menu.c"
+#include "preprocess.c"