upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-02-03 20:29:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Nicer error for typo in include directive.

Browse source 
git-svn-id: file:///svn/unbound/trunk@1459 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2009-02-06 08:53:00 +00:00
parent 00fe7f1b87
commit 2705aaaad9
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/Changelog
View file

@ -1,6 +1,8 @@
6 February 2009: Wouter
- contrib contains specfile for fedora 1.2.1 (from Paul Wouters).
- iana portlist updated.
- fixup EOL in include directive (reported by Paul Wouters).
You can no longer specify newlines in the names of included files.
5 February 2009: Wouter
- ldns 1.5.0 rc as tarball included.

15
util/configlexer.c
View file

@ -2223,11 +2223,12 @@ case 108:
/* rule 108 can match eol */
YY_RULE_SETUP
#line 261 "util/configlexer.lex"
{ cfg_parser->line++; yymore(); }
{ yyerror("EOL before \" in include name");
cfg_parser->line++; BEGIN(INITIAL); }
YY_BREAK
case 109:
YY_RULE_SETUP
#line 262 "util/configlexer.lex"
#line 263 "util/configlexer.lex"
{
LEXOUT(("IQE "));
yytext[yyleng - 1] = '\0';
@ -2236,7 +2237,7 @@ YY_RULE_SETUP
}
YY_BREAK
case YY_STATE_EOF(INITIAL):
#line 268 "util/configlexer.lex"
#line 269 "util/configlexer.lex"
{
yy_set_bol(1); /* Set beginning of line, so "^" rules match. */
if (config_include_stack_ptr == 0) {
@ -2249,16 +2250,16 @@ case YY_STATE_EOF(INITIAL):
YY_BREAK
case 110:
YY_RULE_SETUP
#line 278 "util/configlexer.lex"
#line 279 "util/configlexer.lex"
{ LEXOUT(("unquotedstr(%s) ", yytext));
yylval.str = strdup(yytext); return STRING; }
YY_BREAK
case 111:
YY_RULE_SETUP
#line 281 "util/configlexer.lex"
#line 282 "util/configlexer.lex"
ECHO;
YY_BREAK
#line 2261 "<stdout>"
#line 2262 "<stdout>"
case YY_END_OF_BUFFER:
{
@ -3217,7 +3218,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
#line 281 "util/configlexer.lex"
#line 282 "util/configlexer.lex"

3
util/configlexer.lex
View file

@ -258,7 +258,8 @@ include{COLON} { LEXOUT(("v(%s) ", yytext)); BEGIN(include); }
BEGIN(INITIAL);
}
<include_quoted>{DQANY}* { LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
<include_quoted>{NEWLINE} { cfg_parser->line++; yymore(); }
<include_quoted>{NEWLINE} { yyerror("EOL before \" in include name");
cfg_parser->line++; BEGIN(INITIAL); }
<include_quoted>\" {
LEXOUT(("IQE "));
yytext[yyleng - 1] = '\0';