diff options
author | dkf <donal.k.fellows@manchester.ac.uk> | 2014-09-14 16:51:49 (GMT) |
---|---|---|
committer | dkf <donal.k.fellows@manchester.ac.uk> | 2014-09-14 16:51:49 (GMT) |
commit | 271b5469d26171f90501fd3dc1eea1bf2bd83b08 (patch) | |
tree | 390fd760e66cc765b1400f22af69dc5ef2a00f66 /generic/tclUtil.c | |
parent | bbf5dede141290a90faaa2bbf2e8abba59d33c04 (diff) | |
parent | 7e17c358eb7a149fbec81f4c2e5d1adefcc90bdd (diff) | |
download | tcl-271b5469d26171f90501fd3dc1eea1bf2bd83b08.zip tcl-271b5469d26171f90501fd3dc1eea1bf2bd83b08.tar.gz tcl-271b5469d26171f90501fd3dc1eea1bf2bd83b08.tar.bz2 |
merge trunk
Diffstat (limited to 'generic/tclUtil.c')
-rw-r--r-- | generic/tclUtil.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/generic/tclUtil.c b/generic/tclUtil.c index ae3adae..64589a2 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -4249,7 +4249,8 @@ TclReToGlob( const char *reStr, int reStrLen, Tcl_DString *dsPtr, - int *exactPtr) + int *exactPtr, + int *quantifiersFoundPtr) { int anchorLeft, anchorRight, lastIsStar, numStars; char *dsStr, *dsStrStart; @@ -4257,6 +4258,9 @@ TclReToGlob( strEnd = reStr + reStrLen; Tcl_DStringInit(dsPtr); + if (quantifiersFoundPtr != NULL) { + *quantifiersFoundPtr = 0; + } /* * "***=xxx" == "*xxx*", watch for glob-sensitive chars. @@ -4369,6 +4373,9 @@ TclReToGlob( } break; case '.': + if (quantifiersFoundPtr != NULL) { + *quantifiersFoundPtr = 1; + } anchorLeft = 0; /* prevent exact match */ if (p+1 < strEnd) { if (p[1] == '*') { |