/[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 148 by ph10, Wed Apr 4 14:06:52 2007 UTC revision 149 by ph10, Mon Apr 16 15:28:08 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;
2179    default: return PCRE_ERROR_BADNEWLINE;    default: return PCRE_ERROR_BADNEWLINE;
2180    }    }
2181    
2182  if (newline < 0)  if (newline == -2)
2183      {
2184      md->nltype = NLTYPE_ANYCRLF;
2185      }
2186    else if (newline < 0)
2187    {    {
2188    md->nltype = NLTYPE_ANY;    md->nltype = NLTYPE_ANY;
2189    }    }
# Line 2309  for (;;) Line 2314  for (;;)
2314          while (current_subject <= end_subject && !WAS_NEWLINE(current_subject))          while (current_subject <= end_subject && !WAS_NEWLINE(current_subject))
2315            current_subject++;            current_subject++;
2316    
2317          /* If we have just passed a CR and the newline option is ANY, and we          /* If we have just passed a CR and the newline option is ANY or
2318          are now at a LF, advance the match position by one more character. */          ANYCRLF, and we are now at a LF, advance the match position by one more
2319            character. */
2320    
2321          if (current_subject[-1] == '\r' &&          if (current_subject[-1] == '\r' &&
2322               md->nltype == NLTYPE_ANY &&               (md->nltype == NLTYPE_ANY || md->nltype == NLTYPE_ANYCRLF) &&
2323               current_subject < end_subject &&               current_subject < end_subject &&
2324               *current_subject == '\n')               *current_subject == '\n')
2325            current_subject++;            current_subject++;
# Line 2425  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, and we    /* If we have just passed a CR and the newline option is CRLF or ANY or
2435    are now at a LF, advance the match position by one more character. */    ANYCRLF, and we are now at a LF, advance the match position by one more
2436      character. */
2437    
2438    if (current_subject[-1] == '\r' &&    if (current_subject[-1] == '\r' &&
2439         (md->nltype == NLTYPE_ANY || md->nllen == 2) &&         (md->nltype == NLTYPE_ANY ||
2440            md->nltype == NLTYPE_ANYCRLF ||
2441            md->nllen == 2) &&
2442         current_subject < end_subject &&         current_subject < end_subject &&
2443         *current_subject == '\n')         *current_subject == '\n')
2444      current_subject++;      current_subject++;

Legend:
Removed from v.148  
changed lines
  Added in v.149

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12