X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=inline;f=config%2Fzconf.l;h=112a0ee1b0a0c2c6c33354aa24f1ed708066a700;hb=6b4d2c4d403607081898cef5ff722a9c6509087f;hp=62a0973bee034f4c4fd23bd16f2f1c131665fe3c;hpb=c9645e9489aac917a4883ddecc857b1c6fcc2c38;p=carl9170fw.git

diff --git a/config/zconf.l b/config/zconf.l
index 62a0973..112a0ee 100644
--- a/config/zconf.l
+++ b/config/zconf.l
@@ -73,7 +73,7 @@ static void warn_ignored_character(char chr)
 {
 	fprintf(stderr,
 	        "%s:%d:warning: ignoring unsupported character '%c'\n",
-	        zconf_curname(), zconf_lineno(), chr);
+	        current_file->name, yylineno, chr);
 }
 %}
 
@@ -114,6 +114,13 @@ n	[A-Za-z0-9_-]
 		yylval.string = text;
 		return T_VARIABLE;
 	}
+	({n}|$)+	{
+		/* this token includes at least one '$' */
+		yylval.string = expand_token(yytext, yyleng);
+		if (strlen(yylval.string))
+			return T_VARIABLE;
+		free(yylval.string);
+	}
 	"="	{ BEGIN(ASSIGN_VAL); yylval.flavor = VAR_RECURSIVE; return T_ASSIGN; }
 	":="	{ BEGIN(ASSIGN_VAL); yylval.flavor = VAR_SIMPLE; return T_ASSIGN; }
 	"+="	{ BEGIN(ASSIGN_VAL); yylval.flavor = VAR_APPEND; return T_ASSIGN; }