1
*** maradns-1.3.01/parse/Csv2_parse.c 2006-12-21 00:34:46.000000000 -0800
2
--- maradns-1.3.02/parse/Csv2_parse.c 2006-12-23 07:37:27.000000000 -0800
6
/* process_comment: Process a comment that we find in the input stream */
7
void process_comment(csv2_read *stream) {
12
in = csv2_readchar(stream);
13
! /* Only the first tilde is considered a tilde */
14
! if(in == '~' && q != 1) {
15
(stream->tilde_seen)--;
20
/* process_comment: Process a comment that we find in the input stream */
21
void process_comment(csv2_read *stream) {
25
! z = stream->chars_allowed;
26
! csv2_allow_tilde(stream);
28
in = csv2_readchar(stream);
29
! /* Tildes are allowed (and ignored) in comments */
31
(stream->tilde_seen)--;
39
} while(in != '\n' && in != '\r' && in != -2 /* EOF */);
40
+ stream->chars_allowed = z;
43
/* Handler for processing things before the beginning of a RR; this
52
- (stream->tilde_handling == 2 ||
53
- stream->tilde_handling == 3)) {
55
- csv2_allow_tilde(stream);
57
process_comment(stream);
59
- csv2_forbid_tilde(stream);
63
else if(options != 1 && is_ok(in)) {
65
*** maradns-1.3.01/doc/en/source/csv2.ej 2006-12-21 00:34:46.000000000 -0800
66
--- maradns-1.3.02/doc/en/source/csv2.ej 2006-12-23 07:38:57.000000000 -0800
70
The zone file supports comments; comments are specified by having a '#'
71
anywhere between fields or records; when a '#' is seen, the csv2 parser
72
! ignores any character it sees (with the exception of the '{' and '~'
73
! characters) until a newline. A '#' can usually be placed inside a field,
74
! and indicates the end of a field when placed there.
77
! A '{' character can never be placed in a comment. I '~' character normally
78
! can not be placed in a comment; the only time it can be placed in a comment
79
! is between resource records. If the '~' character is placed immediately
80
! after the initial '#' character, the '~' is used as a resource record
81
! delimiter. Otherwise, the '~' character has no meta-significance.
87
The zone file supports comments; comments are specified by having a '#'
88
anywhere between fields or records; when a '#' is seen, the csv2 parser
89
! ignores any character it sees (with the exception of the '{', which
90
! is not allowed in comments) until a newline. A '#' can usually be
91
! placed inside a field, and indicates the end of a field when placed there.
94
! A '{' character can never be placed in a comment. A '~' character is always
95
! allowed in a comment, and has no special meaning when placed in a comment.