ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

save options before doing DNS multiline mode

Browse Source
This commit is contained in:
Bob Halley
1999-01-28 18:15:57 +00:00
parent 1453fd8dde
commit 918ef3a73e
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/isc/include/isc/lex.h
View File

@@ -75,8 +75,9 @@
/*
* The ISC_LEXOPT_DNSMULTILINE option handles the processing of '(' and ')' in
* the DNS master file format. If this option is set, then the
* ISC_LEXOPT_INITIALWS and ISC_LEXOPT_EOL options will be ignored.
* To use this option, '(' and ')' must be special characters.
* ISC_LEXOPT_INITIALWS and ISC_LEXOPT_EOL options will be ignored when
* the paren count is > 0. To use this option, '(' and ')' must be special
* characters.
*/
#define ISC_LEXOPT_DNSMULTILINE 0x20 /* Handle '(' and ')'. */
#define ISC_LEXOPT_NOMORE 0x40 /* Want "no more" token. */

14
lib/isc/lex.c
View File

@@ -300,7 +300,7 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
char *curr, *prev;
size_t remaining;
u_long u_long;
unsigned int i;
unsigned int i, saved_options;
/*
* Get the next token.
@@ -338,12 +338,9 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
return (ISC_R_EOF);
}
if ((options & ISC_LEXOPT_DNSMULTILINE) != 0) {
if (lex->paren_count > 0)
options &= ~IWSEOL;
else
options |= IWSEOL;
}
saved_options = options;
if ((options & ISC_LEXOPT_DNSMULTILINE) != 0 && lex->paren_count > 0)
options &= ~IWSEOL;
curr = lex->data;
prev = NULL;
@@ -450,7 +447,8 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
return (ISC_R_UNBALANCED);
lex->paren_count--;
if (lex->paren_count == 0)
options |= IWSEOL;
options =
saved_options;
}
continue;
}