[PHP4BETA] CVS update: php4/ext/pcre

From: Date: Sat, 29 May 1999 20:04:05 +0000
Subject: [PHP4BETA] CVS update: php4/ext/pcre
Groups: php.version4 
Request: Send a blank email to php-version4+get-1196@lists.php.net to get a copy of this message
Date: Saturday May 29, 1999 @ 16:04 Author: andrey Update of /repository/php4/ext/pcre In directory php:/tmp/cvs-serv6232/ext/pcre Modified Files: pcre.c Log Message: Fix preg_match_all to do proper matching with \b. Index: php4/ext/pcre/pcre.c diff -u php4/ext/pcre/pcre.c:1.10 php4/ext/pcre/pcre.c:1.11 --- php4/ext/pcre/pcre.c:1.10 Sat May 29 15:38:48 1999 +++ php4/ext/pcre/pcre.c Sat May 29 16:04:05 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pcre.c,v 1.10 1999/05/29 19:38:48 andrey Exp $ */ +/* $Id: pcre.c,v 1.11 1999/05/29 20:04:05 andrey Exp $ */ #include "php.h" @@ -298,8 +298,11 @@ int i; int subpats_order_val; /* Integer value of subpats_order */ const char **stringlist; /* Used to hold list of subpatterns */ - int subject_offset; /* Current position in the subject string */ + char *match, /* The current match */ + *piece, /* The current piece of subject */ + *subject_end; /* Points to the end of the subject */ + /* Get function parameters and do error-checking. */ switch(ARG_COUNT(ht)) { case 2: @@ -374,14 +377,16 @@ } /* Start from the beginning of the string */ - subject_offset = 0; + piece = subject->value.str.val; + subject_end = piece + subject->value.str.len; + match = NULL; do { /* Execute the regular expression. */ - count = pcre_exec(re, extra, &subject->value.str.val[subject_offset], - subject->value.str.len-subject_offset, subject->value.str.val, - (subject_offset ? exoptions|PCRE_NOTBOL : exoptions), - offsets, size_offsets, 0); + count = pcre_exec(re, extra, piece, + subject_end-piece, subject->value.str.val, + (piece==subject->value.str.val ? exoptions : exoptions|PCRE_NOTBOL), + offsets, size_offsets, (piece == match)); /* Check for too many substrings condition. */ if (count == 0) { @@ -392,12 +397,12 @@ /* If something has matched */ if (count >= 0) { matched = 1; + match = piece + offsets[0]; /* If subpatters array has been passed, fill it in with values. */ if (subpats != NULL) { /* Try to get the list of substrings and display a warning if failed. */ - if (pcre_get_substring_list(&subject->value.str.val[subject_offset], - offsets, count, &stringlist) < 0) { + if (pcre_get_substring_list(piece, offsets, count, &stringlist) < 0) { efree(offsets); efree(re); zend_error(E_WARNING, "Get subpatterns list failed"); @@ -437,7 +442,7 @@ php_pcre_free(stringlist); /* Advance to the position right after the last full match */ - subject_offset += offsets[1]; + piece += offsets[1]; } } /* If nothing matched */ -- PHP 4 Beta

« previous php.version4 (#1196) next »