From 5ec48c8510a7f5431d118064fe46fb9ce2cf8dde Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Tue, 9 Apr 2002 09:23:30 +0000 Subject: 16942: Allow zero-length matches in parameter substitutions. --- ChangeLog | 5 +++++ Src/glob.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53504bf41..3c9ecda72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-04-09 Peter Stephenson + + * 16942: Src/glob.c: Allow zero-length matches in parameter + substitutions. + 2002-04-04 Clint Adams * 16934: Completion/Unix/Command/_ssh: complete -1 as well as -2. diff --git a/Src/glob.c b/Src/glob.c index f0fbe2ba1..27a351137 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -2172,7 +2172,7 @@ igetmatch(char **sp, Patprog p, int fl, int n, char *replstr) for (; t < s + l; t++, patoffset++) { /* Find the longest match from this position. */ set_pat_start(p, t-s); - if (pattry(p, t) && patinput > t) { + if (pattry(p, t)) { char *mpos = patinput; if (!(fl & SUB_LONG) && !(p->flags & PAT_PURES)) { char *ptr; @@ -2252,7 +2252,7 @@ igetmatch(char **sp, Patprog p, int fl, int n, char *replstr) if (t > s && t[-1] == Meta) t--; set_pat_start(p, t-s); - if (pattry(p, t) && patinput > t && !--n) { + if (pattry(p, t) && !--n) { /* Found the longest match */ char *mpos = patinput; if (!(fl & SUB_LONG) && !(p->flags & PAT_PURES)) { -- cgit 1.4.1