/[pcre]/code/trunk/pcre_dfa_exec.c
ViewVC logotype

Diff of /code/trunk/pcre_dfa_exec.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 149 by ph10, Mon Apr 16 15:28:08 2007 UTC revision 150 by ph10, Tue Apr 17 08:22:40 2007 UTC
# Line 2175  switch ((((options & PCRE_NEWLINE_BITS) Line 2175  switch ((((options & PCRE_NEWLINE_BITS)
2175    case PCRE_NEWLINE_CR+    case PCRE_NEWLINE_CR+
2176         PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;         PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;
2177    case PCRE_NEWLINE_ANY: newline = -1; break;    case PCRE_NEWLINE_ANY: newline = -1; break;
2178    case PCRE_NEWLINE_ANYCRLF: newline = -2; break;    case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
2179    default: return PCRE_ERROR_BADNEWLINE;    default: return PCRE_ERROR_BADNEWLINE;
2180    }    }
2181    
# Line 2431  for (;;) Line 2431  for (;;)
2431      }      }
2432    if (current_subject > end_subject) break;    if (current_subject > end_subject) break;
2433    
2434    /* If we have just passed a CR and the newline option is CRLF or ANY or    /* If we have just passed a CR and the newline option is CRLF or ANY or
2435    ANYCRLF, and we are now at a LF, advance the match position by one more    ANYCRLF, and we are now at a LF, advance the match position by one more
2436    character. */    character. */
2437    
2438    if (current_subject[-1] == '\r' &&    if (current_subject[-1] == '\r' &&
2439         (md->nltype == NLTYPE_ANY ||         (md->nltype == NLTYPE_ANY ||
2440          md->nltype == NLTYPE_ANYCRLF ||          md->nltype == NLTYPE_ANYCRLF ||
2441          md->nllen == 2) &&          md->nllen == 2) &&
2442         current_subject < end_subject &&         current_subject < end_subject &&
2443         *current_subject == '\n')         *current_subject == '\n')
Legend:
Removed from v.149  
changed lines
  Added in v.150
webmaster@exim.org
 ViewVC Help
Powered by ViewVC 1.1.12