CVS update: php3/pcrelib

Date: Friday May 28, 1999 @ 17:12 Author: andrey Update of /repository/php3/pcrelib In directory php:/tmp/cvs-serv20456/pcrelib Modified Files: pcre.c pcre.h Log Message: Updated PCRE library and PCRE module. Index: php3/pcrelib/pcre.c diff -u php3/pcrelib/pcre.c:1.1 php3/pcrelib/pcre.c:1.2 --- php3/pcrelib/pcre.c:1.1 Thu May 27 16:21:55 1999 +++ php3/pcrelib/pcre.c Fri May 28 17:12:43 1999 @@ -4125,7 +4125,7 @@ int pcre_exec(const pcre *external_re, const pcre_extra *external_extra, - const char *subject, int length, int options, int *offsets, int offsetcount) + const char *subject, int length, int options, int *offsets, int offsetcount, int minlen) { int resetcount, ocount; int first_char = -1; @@ -4285,6 +4285,10 @@ if certain parts of the pattern were not used. */ if (!match(start_match, re->code, 2, &match_block, ims, FALSE, start_match)) + continue; + + /* Check that the match is not closer than minlen (Andrey Zmievski) */ + if (start_match - match_block.start_subject < minlen) continue; /* Copy the offset information from temporary store if necessary */ Index: php3/pcrelib/pcre.h diff -u php3/pcrelib/pcre.h:1.1 php3/pcrelib/pcre.h:1.2 --- php3/pcrelib/pcre.h:1.1 Thu May 27 16:21:55 1999 +++ php3/pcrelib/pcre.h Fri May 28 17:12:43 1999 @@ -59,7 +59,7 @@ const unsigned char *); extern int pcre_copy_substring(const char *, int *, int, int, char *, int); extern int pcre_exec(const pcre *, const pcre_extra *, const char *, - int, int, int *, int); + int, int, int *, int, int); extern int pcre_get_substring(const char *, int *, int, int, const char **); extern int pcre_get_substring_list(const char *, int *, int, const char ***); extern int pcre_info(const pcre *, int *, int *); -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net