summaryrefslogtreecommitdiff
path: root/src/pcre2_compile.c
diff options
context:
space:
mode:
authorph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2017-05-26 17:14:36 +0000
committerph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2017-05-26 17:14:36 +0000
commitb7fb2cb1b30ecba2668d22a97b9fc0d4596520a1 (patch)
tree7a29fbd75ba6824e54aacdfb2b58d537c3671623 /src/pcre2_compile.c
parent413d1379b94d88bcd6ddfc949e1fba4386e9a05b (diff)
downloadpcre2-b7fb2cb1b30ecba2668d22a97b9fc0d4596520a1.tar.gz
Implement PCRE2_NEWLINE_NUL.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@806 6239d852-aaf2-0410-a92c-79f79f948069
Diffstat (limited to 'src/pcre2_compile.c')
-rw-r--r--src/pcre2_compile.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/pcre2_compile.c b/src/pcre2_compile.c
index ed46b2d..f592831 100644
--- a/src/pcre2_compile.c
+++ b/src/pcre2_compile.c
@@ -760,6 +760,7 @@ static pso pso_list[] = {
{ (uint8_t *)STRING_LF_RIGHTPAR, 3, PSO_NL, PCRE2_NEWLINE_LF },
{ (uint8_t *)STRING_CRLF_RIGHTPAR, 5, PSO_NL, PCRE2_NEWLINE_CRLF },
{ (uint8_t *)STRING_ANY_RIGHTPAR, 4, PSO_NL, PCRE2_NEWLINE_ANY },
+ { (uint8_t *)STRING_NUL_RIGHTPAR, 4, PSO_NL, PCRE2_NEWLINE_NUL },
{ (uint8_t *)STRING_ANYCRLF_RIGHTPAR, 8, PSO_NL, PCRE2_NEWLINE_ANYCRLF },
{ (uint8_t *)STRING_BSR_ANYCRLF_RIGHTPAR, 12, PSO_BSR, PCRE2_BSR_ANYCRLF },
{ (uint8_t *)STRING_BSR_UNICODE_RIGHTPAR, 12, PSO_BSR, PCRE2_BSR_UNICODE }
@@ -1911,7 +1912,7 @@ if (c == CHAR_LEFT_CURLY_BRACKET)
{
if (ptr >= cb->end_pattern) goto ERROR_RETURN;
c = *ptr++;
- if (c == CHAR_NULL) goto ERROR_RETURN;
+ if (c == CHAR_NUL) goto ERROR_RETURN;
if (c == CHAR_RIGHT_CURLY_BRACKET) break;
name[i] = c;
}
@@ -6150,7 +6151,7 @@ for (;; pptr++)
}
else *callout_string++ = *pp++;
}
- *callout_string++ = CHAR_NULL;
+ *callout_string++ = CHAR_NUL;
/* Set the length of the entire item, the advance to its end. */
@@ -9160,6 +9161,11 @@ switch(newline)
cb.nl[0] = CHAR_NL;
break;
+ case PCRE2_NEWLINE_NUL:
+ cb.nllen = 1;
+ cb.nl[0] = CHAR_NUL;
+ break;
+
case PCRE2_NEWLINE_CRLF:
cb.nllen = 2;
cb.nl[0] = CHAR_CR;