diff options
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/glob.c | 9 | ||||
| -rw-r--r-- | Src/params.c | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/Src/glob.c b/Src/glob.c index 73a752536..f7c67a00f 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -1936,7 +1936,14 @@ compgetmatch(char *pat, int *flp, char **replstrp) * have one pattern at a time; we will try the must-match test ourselves, * so tell the pattern compiler we are scanning. */ - int patflags = PAT_STATIC|PAT_SCAN|PAT_NOANCH; + + /* int patflags = PAT_STATIC|PAT_SCAN|PAT_NOANCH;*/ + + /* Unfortunately, PAT_STATIC doesn't work if we have a replstr with + * something like ${x#...} in it which will be singsub()ed below because + * that would overwrite the pattern buffer. */ + + int patflags = PAT_SCAN|PAT_NOANCH | (*replstrp ? 0 : PAT_STATIC); /* * Search is anchored to the end of the string if we want to match diff --git a/Src/params.c b/Src/params.c index 52916b06f..014d0b2d4 100644 --- a/Src/params.c +++ b/Src/params.c @@ -1145,9 +1145,11 @@ getindex(char **pptr, Value v) if (*s == ']' || *s == Outbrack) s++; } else { + int com; + if (a > 0) a--; - if (*s == ',') { + if ((com = (*s == ','))) { s++; b = getarg(&s, &inv, v, 1, &dummy); if (b > 0) @@ -1157,7 +1159,7 @@ getindex(char **pptr, Value v) } if (*s == ']' || *s == Outbrack) { s++; - if (v->isarr && a == b && + if (v->isarr && a == b && !com && (!(v->isarr & SCANPM_MATCHMANY) || !(v->isarr & (SCANPM_MATCHKEY | SCANPM_MATCHVAL | SCANPM_KEYMATCH)))) |