upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-22 07:41:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

python include and configlexer fwrite warning.

Browse source 
git-svn-id: file:///svn/unbound/trunk@1608 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2009-04-17 12:14:43 +00:00
parent dd7f5cc718
commit d1a27b6d34
5 changed files with 141 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure vendored
View file

@ -22930,7 +22930,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF _ACEOF
LIBS="$PYTHON_LDFLAGS $LIBS" LIBS="$PYTHON_LDFLAGS $LIBS"
CFLAGS="$CFLAGS $PYTHON_CPPFLAGS" CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
ub_have_python=yes ub_have_python=yes
# Check for SWIG # Check for SWIG

2
configure.ac
View file

@ -301,7 +301,7 @@ if test x_$ub_test_python != x_no; then
# Have Python # Have Python
AC_DEFINE(HAVE_PYTHON,1,[Define if you have Python libraries and header files.]) AC_DEFINE(HAVE_PYTHON,1,[Define if you have Python libraries and header files.])
LIBS="$PYTHON_LDFLAGS $LIBS" LIBS="$PYTHON_LDFLAGS $LIBS"
CFLAGS="$CFLAGS $PYTHON_CPPFLAGS" CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
ub_have_python=yes ub_have_python=yes
# Check for SWIG # Check for SWIG

2
doc/Changelog
View file

@ -5,6 +5,8 @@
- faster fix for winsock reentrant check. - faster fix for winsock reentrant check.
- fix rsasha512 unit test for new (interim) algorithm number. - fix rsasha512 unit test for new (interim) algorithm number.
- fix test:ldns doesn't like DOS line endings in keyfiles on unix. - fix test:ldns doesn't like DOS line endings in keyfiles on unix.
- fix compile warning on ubuntu (configlexer fwrite return value).
- move python include directives into CPPFLAGS instead of CFLAGS.
16 April 2009: Wouter 16 April 2009: Wouter
- winsock event handler exit very quickly on signal, even if - winsock event handler exit very quickly on signal, even if

265
util/configlexer.c
View file

@ -1343,6 +1343,9 @@ void ub_c_error(const char *message);
#define LEXOUT(s) #define LEXOUT(s)
#endif #endif
/** avoid warning in about fwrite return value */
#define ECHO ub_c_error_msg("syntax error at text: %s", yytext)
/** A parser variable, this is a statement in the config file which is /** A parser variable, this is a statement in the config file which is
* of the form variable: value1 value2 ... nargs is the number of values. */ * of the form variable: value1 value2 ... nargs is the number of values. */
#define YDVAR(nargs, var) \ #define YDVAR(nargs, var) \
@ -1412,7 +1415,7 @@ static void config_end_include(void)
#endif #endif
#define YY_NO_INPUT 1 #define YY_NO_INPUT 1
#line 100 "util/configlexer.lex" #line 103 "util/configlexer.lex"
#ifndef YY_NO_UNPUT #ifndef YY_NO_UNPUT
#define YY_NO_UNPUT 1 #define YY_NO_UNPUT 1
#endif #endif
@ -1420,7 +1423,7 @@ static void config_end_include(void)
#define YY_NO_INPUT 1 #define YY_NO_INPUT 1
#endif #endif
#line 1422 "<stdout>" #line 1425 "<stdout>"
#define INITIAL 0 #define INITIAL 0
#define quotedstring 1 #define quotedstring 1
@ -1605,9 +1608,9 @@ YY_DECL
register char *yy_cp, *yy_bp; register char *yy_cp, *yy_bp;
register int yy_act; register int yy_act;
#line 120 "util/configlexer.lex" #line 123 "util/configlexer.lex"
#line 1609 "<stdout>" #line 1612 "<stdout>"
if ( !(yy_init) ) if ( !(yy_init) )
{ {
@ -1698,7 +1701,7 @@ do_action: /* This label is used only to access EOF actions. */
case 1: case 1:
YY_RULE_SETUP YY_RULE_SETUP
#line 121 "util/configlexer.lex" #line 124 "util/configlexer.lex"
{ {
LEXOUT(("SP ")); /* ignore */ } LEXOUT(("SP ")); /* ignore */ }
YY_BREAK YY_BREAK
@ -1707,510 +1710,510 @@ case 2:
(yy_c_buf_p) = yy_cp -= 1; (yy_c_buf_p) = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP YY_RULE_SETUP
#line 123 "util/configlexer.lex" #line 126 "util/configlexer.lex"
{ {
LEXOUT(("comment(%s) ", yytext)); /* ignore */ } LEXOUT(("comment(%s) ", yytext)); /* ignore */ }
YY_BREAK YY_BREAK
case 3: case 3:
YY_RULE_SETUP YY_RULE_SETUP
#line 125 "util/configlexer.lex" #line 128 "util/configlexer.lex"
{ YDVAR(0, VAR_SERVER) } { YDVAR(0, VAR_SERVER) }
YY_BREAK YY_BREAK
case 4: case 4:
YY_RULE_SETUP YY_RULE_SETUP
#line 126 "util/configlexer.lex" #line 129 "util/configlexer.lex"
{ YDVAR(1, VAR_NUM_THREADS) } { YDVAR(1, VAR_NUM_THREADS) }
YY_BREAK YY_BREAK
case 5: case 5:
YY_RULE_SETUP YY_RULE_SETUP
#line 127 "util/configlexer.lex" #line 130 "util/configlexer.lex"
{ YDVAR(1, VAR_VERBOSITY) } { YDVAR(1, VAR_VERBOSITY) }
YY_BREAK YY_BREAK
case 6: case 6:
YY_RULE_SETUP YY_RULE_SETUP
#line 128 "util/configlexer.lex" #line 131 "util/configlexer.lex"
{ YDVAR(1, VAR_PORT) } { YDVAR(1, VAR_PORT) }
YY_BREAK YY_BREAK
case 7: case 7:
YY_RULE_SETUP YY_RULE_SETUP
#line 129 "util/configlexer.lex" #line 132 "util/configlexer.lex"
{ YDVAR(1, VAR_OUTGOING_RANGE) } { YDVAR(1, VAR_OUTGOING_RANGE) }
YY_BREAK YY_BREAK
case 8: case 8:
YY_RULE_SETUP YY_RULE_SETUP
#line 130 "util/configlexer.lex" #line 133 "util/configlexer.lex"
{ YDVAR(1, VAR_OUTGOING_PORT_PERMIT) } { YDVAR(1, VAR_OUTGOING_PORT_PERMIT) }
YY_BREAK YY_BREAK
case 9: case 9:
YY_RULE_SETUP YY_RULE_SETUP
#line 131 "util/configlexer.lex" #line 134 "util/configlexer.lex"
{ YDVAR(1, VAR_OUTGOING_PORT_AVOID) } { YDVAR(1, VAR_OUTGOING_PORT_AVOID) }
YY_BREAK YY_BREAK
case 10: case 10:
YY_RULE_SETUP YY_RULE_SETUP
#line 132 "util/configlexer.lex" #line 135 "util/configlexer.lex"
{ YDVAR(1, VAR_OUTGOING_NUM_TCP) } { YDVAR(1, VAR_OUTGOING_NUM_TCP) }
YY_BREAK YY_BREAK
case 11: case 11:
YY_RULE_SETUP YY_RULE_SETUP
#line 133 "util/configlexer.lex" #line 136 "util/configlexer.lex"
{ YDVAR(1, VAR_INCOMING_NUM_TCP) } { YDVAR(1, VAR_INCOMING_NUM_TCP) }
YY_BREAK YY_BREAK
case 12: case 12:
YY_RULE_SETUP YY_RULE_SETUP
#line 134 "util/configlexer.lex" #line 137 "util/configlexer.lex"
{ YDVAR(1, VAR_DO_IP4) } { YDVAR(1, VAR_DO_IP4) }
YY_BREAK YY_BREAK
case 13: case 13:
YY_RULE_SETUP YY_RULE_SETUP
#line 135 "util/configlexer.lex" #line 138 "util/configlexer.lex"
{ YDVAR(1, VAR_DO_IP6) } { YDVAR(1, VAR_DO_IP6) }
YY_BREAK YY_BREAK
case 14: case 14:
YY_RULE_SETUP YY_RULE_SETUP
#line 136 "util/configlexer.lex" #line 139 "util/configlexer.lex"
{ YDVAR(1, VAR_DO_UDP) } { YDVAR(1, VAR_DO_UDP) }
YY_BREAK YY_BREAK
case 15: case 15:
YY_RULE_SETUP YY_RULE_SETUP
#line 137 "util/configlexer.lex" #line 140 "util/configlexer.lex"
{ YDVAR(1, VAR_DO_TCP) } { YDVAR(1, VAR_DO_TCP) }
YY_BREAK YY_BREAK
case 16: case 16:
YY_RULE_SETUP YY_RULE_SETUP
#line 138 "util/configlexer.lex" #line 141 "util/configlexer.lex"
{ YDVAR(1, VAR_DO_DAEMONIZE) } { YDVAR(1, VAR_DO_DAEMONIZE) }
YY_BREAK YY_BREAK
case 17: case 17:
YY_RULE_SETUP YY_RULE_SETUP
#line 139 "util/configlexer.lex" #line 142 "util/configlexer.lex"
{ YDVAR(1, VAR_INTERFACE) } { YDVAR(1, VAR_INTERFACE) }
YY_BREAK YY_BREAK
case 18: case 18:
YY_RULE_SETUP YY_RULE_SETUP
#line 140 "util/configlexer.lex" #line 143 "util/configlexer.lex"
{ YDVAR(1, VAR_OUTGOING_INTERFACE) } { YDVAR(1, VAR_OUTGOING_INTERFACE) }
YY_BREAK YY_BREAK
case 19: case 19:
YY_RULE_SETUP YY_RULE_SETUP
#line 141 "util/configlexer.lex" #line 144 "util/configlexer.lex"
{ YDVAR(1, VAR_INTERFACE_AUTOMATIC) } { YDVAR(1, VAR_INTERFACE_AUTOMATIC) }
YY_BREAK YY_BREAK
case 20: case 20:
YY_RULE_SETUP YY_RULE_SETUP
#line 142 "util/configlexer.lex" #line 145 "util/configlexer.lex"
{ YDVAR(1, VAR_CHROOT) } { YDVAR(1, VAR_CHROOT) }
YY_BREAK YY_BREAK
case 21: case 21:
YY_RULE_SETUP YY_RULE_SETUP
#line 143 "util/configlexer.lex" #line 146 "util/configlexer.lex"
{ YDVAR(1, VAR_USERNAME) } { YDVAR(1, VAR_USERNAME) }
YY_BREAK YY_BREAK
case 22: case 22:
YY_RULE_SETUP YY_RULE_SETUP
#line 144 "util/configlexer.lex" #line 147 "util/configlexer.lex"
{ YDVAR(1, VAR_DIRECTORY) } { YDVAR(1, VAR_DIRECTORY) }
YY_BREAK YY_BREAK
case 23: case 23:
YY_RULE_SETUP YY_RULE_SETUP
#line 145 "util/configlexer.lex" #line 148 "util/configlexer.lex"
{ YDVAR(1, VAR_LOGFILE) } { YDVAR(1, VAR_LOGFILE) }
YY_BREAK YY_BREAK
case 24: case 24:
YY_RULE_SETUP YY_RULE_SETUP
#line 146 "util/configlexer.lex" #line 149 "util/configlexer.lex"
{ YDVAR(1, VAR_PIDFILE) } { YDVAR(1, VAR_PIDFILE) }
YY_BREAK YY_BREAK
case 25: case 25:
YY_RULE_SETUP YY_RULE_SETUP
#line 147 "util/configlexer.lex" #line 150 "util/configlexer.lex"
{ YDVAR(1, VAR_ROOT_HINTS) } { YDVAR(1, VAR_ROOT_HINTS) }
YY_BREAK YY_BREAK
case 26: case 26:
YY_RULE_SETUP YY_RULE_SETUP
#line 148 "util/configlexer.lex" #line 151 "util/configlexer.lex"
{ YDVAR(1, VAR_MSG_BUFFER_SIZE) } { YDVAR(1, VAR_MSG_BUFFER_SIZE) }
YY_BREAK YY_BREAK
case 27: case 27:
YY_RULE_SETUP YY_RULE_SETUP
#line 149 "util/configlexer.lex" #line 152 "util/configlexer.lex"
{ YDVAR(1, VAR_MSG_CACHE_SIZE) } { YDVAR(1, VAR_MSG_CACHE_SIZE) }
YY_BREAK YY_BREAK
case 28: case 28:
YY_RULE_SETUP YY_RULE_SETUP
#line 150 "util/configlexer.lex" #line 153 "util/configlexer.lex"
{ YDVAR(1, VAR_MSG_CACHE_SLABS) } { YDVAR(1, VAR_MSG_CACHE_SLABS) }
YY_BREAK YY_BREAK
case 29: case 29:
YY_RULE_SETUP YY_RULE_SETUP
#line 151 "util/configlexer.lex" #line 154 "util/configlexer.lex"
{ YDVAR(1, VAR_RRSET_CACHE_SIZE) } { YDVAR(1, VAR_RRSET_CACHE_SIZE) }
YY_BREAK YY_BREAK
case 30: case 30:
YY_RULE_SETUP YY_RULE_SETUP
#line 152 "util/configlexer.lex" #line 155 "util/configlexer.lex"
{ YDVAR(1, VAR_RRSET_CACHE_SLABS) } { YDVAR(1, VAR_RRSET_CACHE_SLABS) }
YY_BREAK YY_BREAK
case 31: case 31:
YY_RULE_SETUP YY_RULE_SETUP
#line 153 "util/configlexer.lex" #line 156 "util/configlexer.lex"
{ YDVAR(1, VAR_CACHE_MAX_TTL) } { YDVAR(1, VAR_CACHE_MAX_TTL) }
YY_BREAK YY_BREAK
case 32: case 32:
YY_RULE_SETUP YY_RULE_SETUP
#line 154 "util/configlexer.lex" #line 157 "util/configlexer.lex"
{ YDVAR(1, VAR_CACHE_MIN_TTL) } { YDVAR(1, VAR_CACHE_MIN_TTL) }
YY_BREAK YY_BREAK
case 33: case 33:
YY_RULE_SETUP YY_RULE_SETUP
#line 155 "util/configlexer.lex" #line 158 "util/configlexer.lex"
{ YDVAR(1, VAR_INFRA_HOST_TTL) } { YDVAR(1, VAR_INFRA_HOST_TTL) }
YY_BREAK YY_BREAK
case 34: case 34:
YY_RULE_SETUP YY_RULE_SETUP
#line 156 "util/configlexer.lex" #line 159 "util/configlexer.lex"
{ YDVAR(1, VAR_INFRA_LAME_TTL) } { YDVAR(1, VAR_INFRA_LAME_TTL) }
YY_BREAK YY_BREAK
case 35: case 35:
YY_RULE_SETUP YY_RULE_SETUP
#line 157 "util/configlexer.lex" #line 160 "util/configlexer.lex"
{ YDVAR(1, VAR_INFRA_CACHE_SLABS) } { YDVAR(1, VAR_INFRA_CACHE_SLABS) }
YY_BREAK YY_BREAK
case 36: case 36:
YY_RULE_SETUP YY_RULE_SETUP
#line 158 "util/configlexer.lex" #line 161 "util/configlexer.lex"
{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) } { YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) }
YY_BREAK YY_BREAK
case 37: case 37:
YY_RULE_SETUP YY_RULE_SETUP
#line 159 "util/configlexer.lex" #line 162 "util/configlexer.lex"
{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) } { YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) }
YY_BREAK YY_BREAK
case 38: case 38:
YY_RULE_SETUP YY_RULE_SETUP
#line 160 "util/configlexer.lex" #line 163 "util/configlexer.lex"
{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) } { YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) }
YY_BREAK YY_BREAK
case 39: case 39:
YY_RULE_SETUP YY_RULE_SETUP
#line 161 "util/configlexer.lex" #line 164 "util/configlexer.lex"
{ YDVAR(1, VAR_JOSTLE_TIMEOUT) } { YDVAR(1, VAR_JOSTLE_TIMEOUT) }
YY_BREAK YY_BREAK
case 40: case 40:
YY_RULE_SETUP YY_RULE_SETUP
#line 162 "util/configlexer.lex" #line 165 "util/configlexer.lex"
{ YDVAR(1, VAR_TARGET_FETCH_POLICY) } { YDVAR(1, VAR_TARGET_FETCH_POLICY) }
YY_BREAK YY_BREAK
case 41: case 41:
YY_RULE_SETUP YY_RULE_SETUP
#line 163 "util/configlexer.lex" #line 166 "util/configlexer.lex"
{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } { YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) }
YY_BREAK YY_BREAK
case 42: case 42:
YY_RULE_SETUP YY_RULE_SETUP
#line 164 "util/configlexer.lex" #line 167 "util/configlexer.lex"
{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } { YDVAR(1, VAR_HARDEN_LARGE_QUERIES) }
YY_BREAK YY_BREAK
case 43: case 43:
YY_RULE_SETUP YY_RULE_SETUP
#line 165 "util/configlexer.lex" #line 168 "util/configlexer.lex"
{ YDVAR(1, VAR_HARDEN_GLUE) } { YDVAR(1, VAR_HARDEN_GLUE) }
YY_BREAK YY_BREAK
case 44: case 44:
YY_RULE_SETUP YY_RULE_SETUP
#line 166 "util/configlexer.lex" #line 169 "util/configlexer.lex"
{ YDVAR(1, VAR_HARDEN_DNNSEC_STRIPPED) } { YDVAR(1, VAR_HARDEN_DNNSEC_STRIPPED) }
YY_BREAK YY_BREAK
case 45: case 45:
YY_RULE_SETUP YY_RULE_SETUP
#line 167 "util/configlexer.lex" #line 170 "util/configlexer.lex"
{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } { YDVAR(1, VAR_HARDEN_REFERRAL_PATH) }
YY_BREAK YY_BREAK
case 46: case 46:
YY_RULE_SETUP YY_RULE_SETUP
#line 168 "util/configlexer.lex" #line 171 "util/configlexer.lex"
{ YDVAR(1, VAR_USE_CAPS_FOR_ID) } { YDVAR(1, VAR_USE_CAPS_FOR_ID) }
YY_BREAK YY_BREAK
case 47: case 47:
YY_RULE_SETUP YY_RULE_SETUP
#line 169 "util/configlexer.lex" #line 172 "util/configlexer.lex"
{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } { YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
YY_BREAK YY_BREAK
case 48: case 48:
YY_RULE_SETUP YY_RULE_SETUP
#line 170 "util/configlexer.lex" #line 173 "util/configlexer.lex"
{ YDVAR(1, VAR_PRIVATE_ADDRESS) } { YDVAR(1, VAR_PRIVATE_ADDRESS) }
YY_BREAK YY_BREAK
case 49: case 49:
YY_RULE_SETUP YY_RULE_SETUP
#line 171 "util/configlexer.lex" #line 174 "util/configlexer.lex"
{ YDVAR(1, VAR_PRIVATE_DOMAIN) } { YDVAR(1, VAR_PRIVATE_DOMAIN) }
YY_BREAK YY_BREAK
case 50: case 50:
YY_RULE_SETUP YY_RULE_SETUP
#line 172 "util/configlexer.lex" #line 175 "util/configlexer.lex"
{ YDVAR(0, VAR_STUB_ZONE) } { YDVAR(0, VAR_STUB_ZONE) }
YY_BREAK YY_BREAK
case 51: case 51:
YY_RULE_SETUP YY_RULE_SETUP
#line 173 "util/configlexer.lex" #line 176 "util/configlexer.lex"
{ YDVAR(1, VAR_NAME) } { YDVAR(1, VAR_NAME) }
YY_BREAK YY_BREAK
case 52: case 52:
YY_RULE_SETUP YY_RULE_SETUP
#line 174 "util/configlexer.lex" #line 177 "util/configlexer.lex"
{ YDVAR(1, VAR_STUB_ADDR) } { YDVAR(1, VAR_STUB_ADDR) }
YY_BREAK YY_BREAK
case 53: case 53:
YY_RULE_SETUP YY_RULE_SETUP
#line 175 "util/configlexer.lex" #line 178 "util/configlexer.lex"
{ YDVAR(1, VAR_STUB_HOST) } { YDVAR(1, VAR_STUB_HOST) }
YY_BREAK YY_BREAK
case 54: case 54:
YY_RULE_SETUP YY_RULE_SETUP
#line 176 "util/configlexer.lex" #line 179 "util/configlexer.lex"
{ YDVAR(1, VAR_STUB_PRIME) } { YDVAR(1, VAR_STUB_PRIME) }
YY_BREAK YY_BREAK
case 55: case 55:
YY_RULE_SETUP YY_RULE_SETUP
#line 177 "util/configlexer.lex" #line 180 "util/configlexer.lex"
{ YDVAR(0, VAR_FORWARD_ZONE) } { YDVAR(0, VAR_FORWARD_ZONE) }
YY_BREAK YY_BREAK
case 56: case 56:
YY_RULE_SETUP YY_RULE_SETUP
#line 178 "util/configlexer.lex" #line 181 "util/configlexer.lex"
{ YDVAR(1, VAR_FORWARD_ADDR) } { YDVAR(1, VAR_FORWARD_ADDR) }
YY_BREAK YY_BREAK
case 57: case 57:
YY_RULE_SETUP YY_RULE_SETUP
#line 179 "util/configlexer.lex" #line 182 "util/configlexer.lex"
{ YDVAR(1, VAR_FORWARD_HOST) } { YDVAR(1, VAR_FORWARD_HOST) }
YY_BREAK YY_BREAK
case 58: case 58:
YY_RULE_SETUP YY_RULE_SETUP
#line 180 "util/configlexer.lex" #line 183 "util/configlexer.lex"
{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) } { YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
YY_BREAK YY_BREAK
case 59: case 59:
YY_RULE_SETUP YY_RULE_SETUP
#line 181 "util/configlexer.lex" #line 184 "util/configlexer.lex"
{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } { YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
YY_BREAK YY_BREAK
case 60: case 60:
YY_RULE_SETUP YY_RULE_SETUP
#line 182 "util/configlexer.lex" #line 185 "util/configlexer.lex"
{ YDVAR(2, VAR_ACCESS_CONTROL) } { YDVAR(2, VAR_ACCESS_CONTROL) }
YY_BREAK YY_BREAK
case 61: case 61:
YY_RULE_SETUP YY_RULE_SETUP
#line 183 "util/configlexer.lex" #line 186 "util/configlexer.lex"
{ YDVAR(1, VAR_HIDE_IDENTITY) } { YDVAR(1, VAR_HIDE_IDENTITY) }
YY_BREAK YY_BREAK
case 62: case 62:
YY_RULE_SETUP YY_RULE_SETUP
#line 184 "util/configlexer.lex" #line 187 "util/configlexer.lex"
{ YDVAR(1, VAR_HIDE_VERSION) } { YDVAR(1, VAR_HIDE_VERSION) }
YY_BREAK YY_BREAK
case 63: case 63:
YY_RULE_SETUP YY_RULE_SETUP
#line 185 "util/configlexer.lex" #line 188 "util/configlexer.lex"
{ YDVAR(1, VAR_IDENTITY) } { YDVAR(1, VAR_IDENTITY) }
YY_BREAK YY_BREAK
case 64: case 64:
YY_RULE_SETUP YY_RULE_SETUP
#line 186 "util/configlexer.lex" #line 189 "util/configlexer.lex"
{ YDVAR(1, VAR_VERSION) } { YDVAR(1, VAR_VERSION) }
YY_BREAK YY_BREAK
case 65: case 65:
YY_RULE_SETUP YY_RULE_SETUP
#line 187 "util/configlexer.lex" #line 190 "util/configlexer.lex"
{ YDVAR(1, VAR_MODULE_CONF) } { YDVAR(1, VAR_MODULE_CONF) }
YY_BREAK YY_BREAK
case 66: case 66:
YY_RULE_SETUP YY_RULE_SETUP
#line 188 "util/configlexer.lex" #line 191 "util/configlexer.lex"
{ YDVAR(1, VAR_DLV_ANCHOR) } { YDVAR(1, VAR_DLV_ANCHOR) }
YY_BREAK YY_BREAK
case 67: case 67:
YY_RULE_SETUP YY_RULE_SETUP
#line 189 "util/configlexer.lex" #line 192 "util/configlexer.lex"
{ YDVAR(1, VAR_DLV_ANCHOR_FILE) } { YDVAR(1, VAR_DLV_ANCHOR_FILE) }
YY_BREAK YY_BREAK
case 68: case 68:
YY_RULE_SETUP YY_RULE_SETUP
#line 190 "util/configlexer.lex" #line 193 "util/configlexer.lex"
{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) } { YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
YY_BREAK YY_BREAK
case 69: case 69:
YY_RULE_SETUP YY_RULE_SETUP
#line 191 "util/configlexer.lex" #line 194 "util/configlexer.lex"
{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) } { YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
YY_BREAK YY_BREAK
case 70: case 70:
YY_RULE_SETUP YY_RULE_SETUP
#line 192 "util/configlexer.lex" #line 195 "util/configlexer.lex"
{ YDVAR(1, VAR_TRUST_ANCHOR) } { YDVAR(1, VAR_TRUST_ANCHOR) }
YY_BREAK YY_BREAK
case 71: case 71:
YY_RULE_SETUP YY_RULE_SETUP
#line 193 "util/configlexer.lex" #line 196 "util/configlexer.lex"
{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } { YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
YY_BREAK YY_BREAK
case 72: case 72:
YY_RULE_SETUP YY_RULE_SETUP
#line 194 "util/configlexer.lex" #line 197 "util/configlexer.lex"
{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } { YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
YY_BREAK YY_BREAK
case 73: case 73:
YY_RULE_SETUP YY_RULE_SETUP
#line 195 "util/configlexer.lex" #line 198 "util/configlexer.lex"
{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } { YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
YY_BREAK YY_BREAK
case 74: case 74:
YY_RULE_SETUP YY_RULE_SETUP
#line 196 "util/configlexer.lex" #line 199 "util/configlexer.lex"
{ YDVAR(1, VAR_BOGUS_TTL) } { YDVAR(1, VAR_BOGUS_TTL) }
YY_BREAK YY_BREAK
case 75: case 75:
YY_RULE_SETUP YY_RULE_SETUP
#line 197 "util/configlexer.lex" #line 200 "util/configlexer.lex"
{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } { YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
YY_BREAK YY_BREAK
case 76: case 76:
YY_RULE_SETUP YY_RULE_SETUP
#line 198 "util/configlexer.lex" #line 201 "util/configlexer.lex"
{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } { YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
YY_BREAK YY_BREAK
case 77: case 77:
YY_RULE_SETUP YY_RULE_SETUP
#line 199 "util/configlexer.lex" #line 202 "util/configlexer.lex"
{ YDVAR(1, VAR_KEY_CACHE_SIZE) } { YDVAR(1, VAR_KEY_CACHE_SIZE) }
YY_BREAK YY_BREAK
case 78: case 78:
YY_RULE_SETUP YY_RULE_SETUP
#line 200 "util/configlexer.lex" #line 203 "util/configlexer.lex"
{ YDVAR(1, VAR_KEY_CACHE_SLABS) } { YDVAR(1, VAR_KEY_CACHE_SLABS) }
YY_BREAK YY_BREAK
case 79: case 79:
YY_RULE_SETUP YY_RULE_SETUP
#line 201 "util/configlexer.lex" #line 204 "util/configlexer.lex"
{ YDVAR(1, VAR_NEG_CACHE_SIZE) } { YDVAR(1, VAR_NEG_CACHE_SIZE) }
YY_BREAK YY_BREAK
case 80: case 80:
YY_RULE_SETUP YY_RULE_SETUP
#line 202 "util/configlexer.lex" #line 205 "util/configlexer.lex"
{ {
YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
YY_BREAK YY_BREAK
case 81: case 81:
YY_RULE_SETUP YY_RULE_SETUP
#line 204 "util/configlexer.lex" #line 207 "util/configlexer.lex"
{ YDVAR(1, VAR_USE_SYSLOG) } { YDVAR(1, VAR_USE_SYSLOG) }
YY_BREAK YY_BREAK
case 82: case 82:
YY_RULE_SETUP YY_RULE_SETUP
#line 205 "util/configlexer.lex" #line 208 "util/configlexer.lex"
{ YDVAR(1, VAR_LOG_TIME_ASCII) } { YDVAR(1, VAR_LOG_TIME_ASCII) }
YY_BREAK YY_BREAK
case 83: case 83:
YY_RULE_SETUP YY_RULE_SETUP
#line 206 "util/configlexer.lex" #line 209 "util/configlexer.lex"
{ YDVAR(2, VAR_LOCAL_ZONE) } { YDVAR(2, VAR_LOCAL_ZONE) }
YY_BREAK YY_BREAK
case 84: case 84:
YY_RULE_SETUP YY_RULE_SETUP
#line 207 "util/configlexer.lex" #line 210 "util/configlexer.lex"
{ YDVAR(1, VAR_LOCAL_DATA) } { YDVAR(1, VAR_LOCAL_DATA) }
YY_BREAK YY_BREAK
case 85: case 85:
YY_RULE_SETUP YY_RULE_SETUP
#line 208 "util/configlexer.lex" #line 211 "util/configlexer.lex"
{ YDVAR(1, VAR_LOCAL_DATA_PTR) } { YDVAR(1, VAR_LOCAL_DATA_PTR) }
YY_BREAK YY_BREAK
case 86: case 86:
YY_RULE_SETUP YY_RULE_SETUP
#line 209 "util/configlexer.lex" #line 212 "util/configlexer.lex"
{ YDVAR(1, VAR_STATISTICS_INTERVAL) } { YDVAR(1, VAR_STATISTICS_INTERVAL) }
YY_BREAK YY_BREAK
case 87: case 87:
YY_RULE_SETUP YY_RULE_SETUP
#line 210 "util/configlexer.lex" #line 213 "util/configlexer.lex"
{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } { YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
YY_BREAK YY_BREAK
case 88: case 88:
YY_RULE_SETUP YY_RULE_SETUP
#line 211 "util/configlexer.lex" #line 214 "util/configlexer.lex"
{ YDVAR(1, VAR_EXTENDED_STATISTICS) } { YDVAR(1, VAR_EXTENDED_STATISTICS) }
YY_BREAK YY_BREAK
case 89: case 89:
YY_RULE_SETUP YY_RULE_SETUP
#line 212 "util/configlexer.lex" #line 215 "util/configlexer.lex"
{ YDVAR(0, VAR_REMOTE_CONTROL) } { YDVAR(0, VAR_REMOTE_CONTROL) }
YY_BREAK YY_BREAK
case 90: case 90:
YY_RULE_SETUP YY_RULE_SETUP
#line 213 "util/configlexer.lex" #line 216 "util/configlexer.lex"
{ YDVAR(1, VAR_CONTROL_ENABLE) } { YDVAR(1, VAR_CONTROL_ENABLE) }
YY_BREAK YY_BREAK
case 91: case 91:
YY_RULE_SETUP YY_RULE_SETUP
#line 214 "util/configlexer.lex" #line 217 "util/configlexer.lex"
{ YDVAR(1, VAR_CONTROL_INTERFACE) } { YDVAR(1, VAR_CONTROL_INTERFACE) }
YY_BREAK YY_BREAK
case 92: case 92:
YY_RULE_SETUP YY_RULE_SETUP
#line 215 "util/configlexer.lex" #line 218 "util/configlexer.lex"
{ YDVAR(1, VAR_CONTROL_PORT) } { YDVAR(1, VAR_CONTROL_PORT) }
YY_BREAK YY_BREAK
case 93: case 93:
YY_RULE_SETUP YY_RULE_SETUP
#line 216 "util/configlexer.lex" #line 219 "util/configlexer.lex"
{ YDVAR(1, VAR_SERVER_KEY_FILE) } { YDVAR(1, VAR_SERVER_KEY_FILE) }
YY_BREAK YY_BREAK
case 94: case 94:
YY_RULE_SETUP YY_RULE_SETUP
#line 217 "util/configlexer.lex" #line 220 "util/configlexer.lex"
{ YDVAR(1, VAR_SERVER_CERT_FILE) } { YDVAR(1, VAR_SERVER_CERT_FILE) }
YY_BREAK YY_BREAK
case 95: case 95:
YY_RULE_SETUP YY_RULE_SETUP
#line 218 "util/configlexer.lex" #line 221 "util/configlexer.lex"
{ YDVAR(1, VAR_CONTROL_KEY_FILE) } { YDVAR(1, VAR_CONTROL_KEY_FILE) }
YY_BREAK YY_BREAK
case 96: case 96:
YY_RULE_SETUP YY_RULE_SETUP
#line 219 "util/configlexer.lex" #line 222 "util/configlexer.lex"
{ YDVAR(1, VAR_CONTROL_CERT_FILE) } { YDVAR(1, VAR_CONTROL_CERT_FILE) }
YY_BREAK YY_BREAK
case 97: case 97:
YY_RULE_SETUP YY_RULE_SETUP
#line 220 "util/configlexer.lex" #line 223 "util/configlexer.lex"
{ YDVAR(1, VAR_PYTHON_SCRIPT) } { YDVAR(1, VAR_PYTHON_SCRIPT) }
YY_BREAK YY_BREAK
case 98: case 98:
YY_RULE_SETUP YY_RULE_SETUP
#line 221 "util/configlexer.lex" #line 224 "util/configlexer.lex"
{ YDVAR(0, VAR_PYTHON) } { YDVAR(0, VAR_PYTHON) }
YY_BREAK YY_BREAK
case 99: case 99:
YY_RULE_SETUP YY_RULE_SETUP
#line 222 "util/configlexer.lex" #line 225 "util/configlexer.lex"
{ YDVAR(1, VAR_DOMAIN_INSECURE) } { YDVAR(1, VAR_DOMAIN_INSECURE) }
YY_BREAK YY_BREAK
case 100: case 100:
/* rule 100 can match eol */ /* rule 100 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 223 "util/configlexer.lex" #line 226 "util/configlexer.lex"
{ LEXOUT(("NL\n")); cfg_parser->line++; } { LEXOUT(("NL\n")); cfg_parser->line++; }
YY_BREAK YY_BREAK
/* Quoted strings. Strip leading and ending quotes */ /* Quoted strings. Strip leading and ending quotes */
case 101: case 101:
YY_RULE_SETUP YY_RULE_SETUP
#line 226 "util/configlexer.lex" #line 229 "util/configlexer.lex"
{ BEGIN(quotedstring); LEXOUT(("QS ")); } { BEGIN(quotedstring); LEXOUT(("QS ")); }
YY_BREAK YY_BREAK
case YY_STATE_EOF(quotedstring): case YY_STATE_EOF(quotedstring):
#line 227 "util/configlexer.lex" #line 230 "util/configlexer.lex"
{ {
yyerror("EOF inside quoted string"); yyerror("EOF inside quoted string");
if(--num_args == 0) { BEGIN(INITIAL); } if(--num_args == 0) { BEGIN(INITIAL); }
@ -2219,19 +2222,19 @@ case YY_STATE_EOF(quotedstring):
YY_BREAK YY_BREAK
case 102: case 102:
YY_RULE_SETUP YY_RULE_SETUP
#line 232 "util/configlexer.lex" #line 235 "util/configlexer.lex"
{ LEXOUT(("STR(%s) ", yytext)); yymore(); } { LEXOUT(("STR(%s) ", yytext)); yymore(); }
YY_BREAK YY_BREAK
case 103: case 103:
/* rule 103 can match eol */ /* rule 103 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 233 "util/configlexer.lex" #line 236 "util/configlexer.lex"
{ yyerror("newline inside quoted string, no end \""); { yyerror("newline inside quoted string, no end \"");
cfg_parser->line++; BEGIN(INITIAL); } cfg_parser->line++; BEGIN(INITIAL); }
YY_BREAK YY_BREAK
case 104: case 104:
YY_RULE_SETUP YY_RULE_SETUP
#line 235 "util/configlexer.lex" #line 238 "util/configlexer.lex"
{ {
LEXOUT(("QE ")); LEXOUT(("QE "));
if(--num_args == 0) { BEGIN(INITIAL); } if(--num_args == 0) { BEGIN(INITIAL); }
@ -2246,11 +2249,11 @@ YY_RULE_SETUP
/* Single Quoted strings. Strip leading and ending quotes */ /* Single Quoted strings. Strip leading and ending quotes */
case 105: case 105:
YY_RULE_SETUP YY_RULE_SETUP
#line 247 "util/configlexer.lex" #line 250 "util/configlexer.lex"
{ BEGIN(singlequotedstr); LEXOUT(("SQS ")); } { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
YY_BREAK YY_BREAK
case YY_STATE_EOF(singlequotedstr): case YY_STATE_EOF(singlequotedstr):
#line 248 "util/configlexer.lex" #line 251 "util/configlexer.lex"
{ {
yyerror("EOF inside quoted string"); yyerror("EOF inside quoted string");
if(--num_args == 0) { BEGIN(INITIAL); } if(--num_args == 0) { BEGIN(INITIAL); }
@ -2259,19 +2262,19 @@ case YY_STATE_EOF(singlequotedstr):
YY_BREAK YY_BREAK
case 106: case 106:
YY_RULE_SETUP YY_RULE_SETUP
#line 253 "util/configlexer.lex" #line 256 "util/configlexer.lex"
{ LEXOUT(("STR(%s) ", yytext)); yymore(); } { LEXOUT(("STR(%s) ", yytext)); yymore(); }
YY_BREAK YY_BREAK
case 107: case 107:
/* rule 107 can match eol */ /* rule 107 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 254 "util/configlexer.lex" #line 257 "util/configlexer.lex"
{ yyerror("newline inside quoted string, no end '"); { yyerror("newline inside quoted string, no end '");
cfg_parser->line++; BEGIN(INITIAL); } cfg_parser->line++; BEGIN(INITIAL); }
YY_BREAK YY_BREAK
case 108: case 108:
YY_RULE_SETUP YY_RULE_SETUP
#line 256 "util/configlexer.lex" #line 259 "util/configlexer.lex"
{ {
LEXOUT(("SQE ")); LEXOUT(("SQE "));
if(--num_args == 0) { BEGIN(INITIAL); } if(--num_args == 0) { BEGIN(INITIAL); }
@ -2286,12 +2289,12 @@ YY_RULE_SETUP
/* include: directive */ /* include: directive */
case 109: case 109:
YY_RULE_SETUP YY_RULE_SETUP
#line 268 "util/configlexer.lex" #line 271 "util/configlexer.lex"
{ {
LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
YY_BREAK YY_BREAK
case YY_STATE_EOF(include): case YY_STATE_EOF(include):
#line 270 "util/configlexer.lex" #line 273 "util/configlexer.lex"
{ {
yyerror("EOF inside include directive"); yyerror("EOF inside include directive");
BEGIN(inc_prev); BEGIN(inc_prev);
@ -2299,23 +2302,23 @@ case YY_STATE_EOF(include):
YY_BREAK YY_BREAK
case 110: case 110:
YY_RULE_SETUP YY_RULE_SETUP
#line 274 "util/configlexer.lex" #line 277 "util/configlexer.lex"
{ LEXOUT(("ISP ")); /* ignore */ } { LEXOUT(("ISP ")); /* ignore */ }
YY_BREAK YY_BREAK
case 111: case 111:
/* rule 111 can match eol */ /* rule 111 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 275 "util/configlexer.lex" #line 278 "util/configlexer.lex"
{ LEXOUT(("NL\n")); cfg_parser->line++;} { LEXOUT(("NL\n")); cfg_parser->line++;}
YY_BREAK YY_BREAK
case 112: case 112:
YY_RULE_SETUP YY_RULE_SETUP
#line 276 "util/configlexer.lex" #line 279 "util/configlexer.lex"
{ LEXOUT(("IQS ")); BEGIN(include_quoted); } { LEXOUT(("IQS ")); BEGIN(include_quoted); }
YY_BREAK YY_BREAK
case 113: case 113:
YY_RULE_SETUP YY_RULE_SETUP
#line 277 "util/configlexer.lex" #line 280 "util/configlexer.lex"
{ {
LEXOUT(("Iunquotedstr(%s) ", yytext)); LEXOUT(("Iunquotedstr(%s) ", yytext));
config_start_include(yytext); config_start_include(yytext);
@ -2323,7 +2326,7 @@ YY_RULE_SETUP
} }
YY_BREAK YY_BREAK
case YY_STATE_EOF(include_quoted): case YY_STATE_EOF(include_quoted):
#line 282 "util/configlexer.lex" #line 285 "util/configlexer.lex"
{ {
yyerror("EOF inside quoted string"); yyerror("EOF inside quoted string");
BEGIN(inc_prev); BEGIN(inc_prev);
@ -2331,19 +2334,19 @@ case YY_STATE_EOF(include_quoted):
YY_BREAK YY_BREAK
case 114: case 114:
YY_RULE_SETUP YY_RULE_SETUP
#line 286 "util/configlexer.lex" #line 289 "util/configlexer.lex"
{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); } { LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
YY_BREAK YY_BREAK
case 115: case 115:
/* rule 115 can match eol */ /* rule 115 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 287 "util/configlexer.lex" #line 290 "util/configlexer.lex"
{ yyerror("newline before \" in include name"); { yyerror("newline before \" in include name");
cfg_parser->line++; BEGIN(inc_prev); } cfg_parser->line++; BEGIN(inc_prev); }
YY_BREAK YY_BREAK
case 116: case 116:
YY_RULE_SETUP YY_RULE_SETUP
#line 289 "util/configlexer.lex" #line 292 "util/configlexer.lex"
{ {
LEXOUT(("IQE ")); LEXOUT(("IQE "));
yytext[yyleng - 1] = '\0'; yytext[yyleng - 1] = '\0';
@ -2353,7 +2356,7 @@ YY_RULE_SETUP
YY_BREAK YY_BREAK
case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(val): case YY_STATE_EOF(val):
#line 295 "util/configlexer.lex" #line 298 "util/configlexer.lex"
{ {
yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ yy_set_bol(1); /* Set beginning of line, so "^" rules match. */
if (config_include_stack_ptr == 0) { if (config_include_stack_ptr == 0) {
@ -2366,31 +2369,31 @@ case YY_STATE_EOF(val):
YY_BREAK YY_BREAK
case 117: case 117:
YY_RULE_SETUP YY_RULE_SETUP
#line 305 "util/configlexer.lex" #line 308 "util/configlexer.lex"
{ LEXOUT(("unquotedstr(%s) ", yytext)); { LEXOUT(("unquotedstr(%s) ", yytext));
if(--num_args == 0) { BEGIN(INITIAL); } if(--num_args == 0) { BEGIN(INITIAL); }
yylval.str = strdup(yytext); return STRING_ARG; } yylval.str = strdup(yytext); return STRING_ARG; }
YY_BREAK YY_BREAK
case 118: case 118:
YY_RULE_SETUP YY_RULE_SETUP
#line 309 "util/configlexer.lex" #line 312 "util/configlexer.lex"
{ {
ub_c_error_msg("unknown keyword '%s'", yytext); ub_c_error_msg("unknown keyword '%s'", yytext);
} }
YY_BREAK YY_BREAK
case 119: case 119:
YY_RULE_SETUP YY_RULE_SETUP
#line 313 "util/configlexer.lex" #line 316 "util/configlexer.lex"
{ {
ub_c_error_msg("stray '%s'", yytext); ub_c_error_msg("stray '%s'", yytext);
} }
YY_BREAK YY_BREAK
case 120: case 120:
YY_RULE_SETUP YY_RULE_SETUP
#line 317 "util/configlexer.lex" #line 320 "util/configlexer.lex"
ECHO; ECHO;
YY_BREAK YY_BREAK
#line 2392 "<stdout>" #line 2395 "<stdout>"
case YY_END_OF_BUFFER: case YY_END_OF_BUFFER:
{ {
@ -3349,7 +3352,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables" #define YYTABLES_NAME "yytables"
#line 317 "util/configlexer.lex" #line 320 "util/configlexer.lex"

3
util/configlexer.lex
View file

@ -25,6 +25,9 @@ void ub_c_error(const char *message);
#define LEXOUT(s) #define LEXOUT(s)
#endif #endif
/** avoid warning in about fwrite return value */
#define ECHO ub_c_error_msg("syntax error at text: %s", yytext)
/** A parser variable, this is a statement in the config file which is /** A parser variable, this is a statement in the config file which is
* of the form variable: value1 value2 ... nargs is the number of values. */ * of the form variable: value1 value2 ... nargs is the number of values. */
#define YDVAR(nargs, var) \ #define YDVAR(nargs, var) \