summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-12-11 20:01:05 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-12-22 00:25:54 +0900
commitf5451582c4e22ce8912aae4950810f3598c9b516 (patch)
treefce36383fca69f12a703ec061fdadc6cb691e78f
parent8636a1f9677db4f883f29a072f401303acfc2edd (diff)
kconfig: stop supporting '.' and '/' in unquoted words
In my understanding, special characters such as '.' and '/' are supported in unquoted words to use bare file paths in the "source" statement. With the previous commit surrounding all file paths with double quotes, we can drop this. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r--scripts/kconfig/preprocess.c3
-rw-r--r--scripts/kconfig/zconf.l4
2 files changed, 3 insertions, 4 deletions
diff --git a/scripts/kconfig/preprocess.c b/scripts/kconfig/preprocess.c
index 5ca2df790d3c..b028a48b0e76 100644
--- a/scripts/kconfig/preprocess.c
+++ b/scripts/kconfig/preprocess.c
@@ -555,8 +555,7 @@ char *expand_string(const char *in)
static bool is_end_of_token(char c)
{
- /* Why are '.' and '/' valid characters for symbols? */
- return !(isalnum(c) || c == '_' || c == '-' || c == '.' || c == '/');
+ return !(isalnum(c) || c == '_' || c == '-');
}
/*
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index f8bd84714e00..90d2f37159dc 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -160,7 +160,7 @@ n [A-Za-z0-9_-]
BEGIN(STRING);
}
\n BEGIN(INITIAL); return T_EOL;
- ({n}|[/.])+ {
+ {n}+ {
const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
if (id && id->flags & TF_PARAM) {
yylval.id = id;
@@ -170,7 +170,7 @@ n [A-Za-z0-9_-]
yylval.string = text;
return T_WORD;
}
- ({n}|[/.$])+ {
+ ({n}|$)+ {
/* this token includes at least one '$' */
yylval.string = expand_token(yytext, yyleng);
if (strlen(yylval.string))