-
OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=138
This commit is contained in:
parent
d4f7a02a88
commit
ae6f9666d7
@ -1,36 +0,0 @@
|
||||
commit 956829c18e8ade666083f1c69043a16a80f70b0d
|
||||
Author: Barton E. Schaefer <schaefer@zsh.org>
|
||||
Date: Sun Sep 7 10:48:32 2014 -0700
|
||||
|
||||
33122: typo from 32891 caused incorrect matches for pcre_match -n
|
||||
|
||||
diff --git a/Src/Modules/pcre.c b/Src/Modules/pcre.c
|
||||
index 040a33f..2393cd1 100644
|
||||
--- a/Src/Modules/pcre.c
|
||||
+++ b/Src/Modules/pcre.c
|
||||
@@ -289,7 +289,7 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func))
|
||||
matched_portion = OPT_ARG(ops,c);
|
||||
}
|
||||
if(OPT_HASARG(ops,c='n')) { /* The offset position to start the search, in bytes. */
|
||||
- if ((offset_start = getposint(OPT_ARG(ops,c), nam) < 0))
|
||||
+ if ((offset_start = getposint(OPT_ARG(ops,c), nam)) < 0)
|
||||
return 1;
|
||||
}
|
||||
/* For the entire match, 'Return' the offset byte positions instead of the matched string */
|
||||
diff --git a/Test/V07pcre.ztst b/Test/V07pcre.ztst
|
||||
index f5b05de..3a65331 100644
|
||||
--- a/Test/V07pcre.ztst
|
||||
+++ b/Test/V07pcre.ztst
|
||||
@@ -108,3 +108,12 @@
|
||||
>1
|
||||
>0 xo→t →t
|
||||
>0 Xo→t →t
|
||||
+
|
||||
+ string="The following zip codes: 78884 90210 99513"
|
||||
+ pcre_compile -m "\d{5}"
|
||||
+ pcre_match -b -- $string && print "$MATCH; ZPCRE_OP: $ZPCRE_OP"
|
||||
+ pcre_match -b -n $ZPCRE_OP[(w)2] -- $string || print failed
|
||||
+ print "$MATCH; ZPCRE_OP: $ZPCRE_OP"
|
||||
+0:pcre_match -b and pcre_match -n
|
||||
+>78884; ZPCRE_OP: 25 30
|
||||
+>90210; ZPCRE_OP: 31 36
|
Loading…
Reference in New Issue
Block a user