[PHP4BETA] CVS update: php4/ext/pcre
| From: | andrey | Date: | Sat, 29 May 1999 19:38:50 +0000 |
| Subject: | [PHP4BETA] CVS update: php4/ext/pcre | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-1194@lists.php.net to get a copy of this message | ||
Date: Saturday May 29, 1999 @ 15:38
Author: andrey
Update of /repository/php4/ext/pcre
In directory php:/tmp/cvs-serv30163
Modified Files:
pcre.c
Log Message:
Fixed PCRE so that global matching with patterns with \b works.
Index: php4/ext/pcre/pcre.c
diff -u php4/ext/pcre/pcre.c:1.9 php4/ext/pcre/pcre.c:1.10
--- php4/ext/pcre/pcre.c:1.9 Fri May 28 16:54:51 1999
+++ php4/ext/pcre/pcre.c Sat May 29 15:38:48 1999
@@ -27,10 +27,8 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pcre.c,v 1.9 1999/05/28 20:54:51 andrey Exp $ */
+/* $Id: pcre.c,v 1.10 1999/05/29 19:38:48 andrey Exp $ */
-/* Get PCRE library from ftp://ftp.cus.cam.ac.uk/pub/software/programs/pcre/
*/
-
#include "php.h"
#if HAVE_PCRE
@@ -381,7 +379,7 @@
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.len-subject_offset, subject->value.str.val,
(subject_offset ? exoptions|PCRE_NOTBOL : exoptions),
offsets, size_offsets, 0);
@@ -548,7 +546,7 @@
while (count >= 0) {
/* Execute the regular expression. */
count = pcre_exec(re, extra, piece,
- subject_end-piece,
+ subject_end-piece, subject,
(piece==subject ? exoptions : exoptions|PCRE_NOTBOL),
offsets, size_offsets, (piece == match));
@@ -796,7 +794,7 @@
/* Get next piece if no limit or limit not yet reached and something matched*/
while ((limit_val == -1 || limit_val > 0) && count >= 0) {
count = pcre_exec(re, extra, &subject->value.str.val[last_offset],
- subject->value.str.len-last_offset,
+ subject->value.str.len-last_offset, subject->value.str.val,
(last_offset ? exoptions|PCRE_NOTBOL : exoptions),
offsets, size_offsets, 0);
--
PHP 4 Beta