about summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorDaniel Shahaf <danielsh@apache.org>2019-12-31 18:07:02 +0000
committerDaniel Shahaf <danielsh@apache.org>2020-01-02 16:00:11 +0000
commitb591d431130a2648738a899296638245b0b93d3a (patch)
treedb63bba73adc02223900829a3754f767eeb08486 /Src
parentda19b67388770514b44f28796d9de4dd239297bd (diff)
downloadzsh-b591d431130a2648738a899296638245b0b93d3a.tar.gz
zsh-b591d431130a2648738a899296638245b0b93d3a.tar.xz
zsh-b591d431130a2648738a899296638245b0b93d3a.zip
45181: Fix workers/45164: ${(S)%%} will now consider the empty string as a potential match.
Diffstat (limited to 'Src')
-rw-r--r--Src/glob.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Src/glob.c b/Src/glob.c
index ca5846704..f67a376b9 100644
--- a/Src/glob.c
+++ b/Src/glob.c
@@ -3059,7 +3059,7 @@ igetmatch(char **sp, Patprog p, int fl, int n, char *replstr,
 	case (SUB_END|SUB_SUBSTR):
 	case (SUB_END|SUB_LONG|SUB_SUBSTR):
 	    /* Longest/shortest at end, matching substrings.       */
-	    if (!(fl & SUB_LONG)) {
+	    {
 		set_pat_start(p, l);
 		if (pattrylen(p, send, 0, 0, &patstralloc, umltot) &&
 		    !--n) {
@@ -3397,7 +3397,7 @@ igetmatch(char **sp, Patprog p, int fl, int n, char *replstr,
 	case (SUB_END|SUB_SUBSTR):
 	case (SUB_END|SUB_LONG|SUB_SUBSTR):
 	    /* Longest/shortest at end, matching substrings.       */
-	    if (!(fl & SUB_LONG)) {
+	    {
 		set_pat_start(p, l);
 		if (pattrylen(p, send, 0, 0, &patstralloc, uml) && !--n) {
 		    *sp = get_match_ret(&imd, uml, uml);