mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

Add addition \ escape processing

Browse Source
This commit is contained in:
Mark Andrews 1999-05-19 00:48:16 +00:00
parent bd3ccd1c38
commit 55ea93b0b1
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,6 +74,7 @@ ISC_LANG_BEGINDECLS
#define ISC_LEXOPT_INITIALWS 0x04 /* Want initial whitespace. */ #define ISC_LEXOPT_INITIALWS 0x04 /* Want initial whitespace. */
#define ISC_LEXOPT_NUMBER 0x08 /* Recognize numbers. */ #define ISC_LEXOPT_NUMBER 0x08 /* Recognize numbers. */
#define ISC_LEXOPT_QSTRING 0x10 /* Recognize qstrings. */ #define ISC_LEXOPT_QSTRING 0x10 /* Recognize qstrings. */
#define ISC_LEXOPT_ESCAPE 0x20 /* Recognize escapes. */
/* /*
* The ISC_LEXOPT_DNSMULTILINE option handles the processing of '(' and ')' in * The ISC_LEXOPT_DNSMULTILINE option handles the processing of '(' and ')' in
* the DNS master file format. If this option is set, then the * the DNS master file format. If this option is set, then the

14
lib/isc/lex.c
View File

@ -382,7 +382,7 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
} }
if (lex->comment_ok && !no_comments) { if (lex->comment_ok && !no_comments) {
if (c == ';' && if (!escaped && c == ';' &&
((lex->comments & ISC_LEXCOMMENT_DNSMASTERFILE) ((lex->comments & ISC_LEXCOMMENT_DNSMASTERFILE)
!= 0)) { != 0)) {
saved_state = state; saved_state = state;
@ -440,7 +440,7 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
if ((options & ISC_LEXOPT_EOL) != 0) if ((options & ISC_LEXOPT_EOL) != 0)
state = lexstate_crlf; state = lexstate_crlf;
} else if (c == '"' && } else if (c == '"' &&
(options & ISC_LEXOPT_QSTRING)) { (options & ISC_LEXOPT_QSTRING) != 0) {
lex->last_was_eol = ISC_FALSE; lex->last_was_eol = ISC_FALSE;
no_comments = ISC_TRUE; no_comments = ISC_TRUE;
state = lexstate_qstring; state = lexstate_qstring;
@ -466,7 +466,7 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
tokenp->value.as_char = c; tokenp->value.as_char = c;
done = ISC_TRUE; done = ISC_TRUE;
} else if (isdigit(c) && } else if (isdigit(c) &&
(options & ISC_LEXOPT_NUMBER)) { (options & ISC_LEXOPT_NUMBER) != 0) {
lex->last_was_eol = ISC_FALSE; lex->last_was_eol = ISC_FALSE;
state = lexstate_number; state = lexstate_number;
goto no_read; goto no_read;
@ -524,8 +524,9 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
return (ISC_R_NOSPACE); return (ISC_R_NOSPACE);
break; break;
case lexstate_string: case lexstate_string:
if (c == ' ' || c == '\t' || c == '\r' || c == '\n' || if ((!escaped &&
c == EOF || lex->specials[c]) { (c == ' ' || c == '\t' || lex->specials[c])) ||
c == '\r' || c == '\n' || c == EOF) {
INSIST(source->char_count < 2); INSIST(source->char_count < 2);
source->chars[source->char_count++] = c; source->chars[source->char_count++] = c;
tokenp->type = isc_tokentype_string; tokenp->type = isc_tokentype_string;
@ -535,6 +536,9 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
done = ISC_TRUE; done = ISC_TRUE;
continue; continue;
} }
if ((options & ISC_LEXOPT_ESCAPE) != 0)
escaped = (!escaped && c == '\\') ?
ISC_TRUE : ISC_FALSE;
if (remaining > 0) { if (remaining > 0) {
*curr++ = c; *curr++ = c;
*curr = 0; *curr = 0;