From b591d431130a2648738a899296638245b0b93d3a Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Tue, 31 Dec 2019 18:07:02 +0000 Subject: 45181: Fix workers/45164: ${(S)%%} will now consider the empty string as a potential match. --- Src/glob.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Src') 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); -- cgit 1.4.1