mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-09-28 15:01:21 +02:00
Code

22572: use of (#m) was broken with pure strings

Browse Source
This commit is contained in:
Peter Stephenson 2006-08-01 11:58:04 +00:00
parent f34e095f4b
commit ee9b17ad2a
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2006-08-01 Peter Stephenson <pws@csr.com>
* 22572: Src/pattern.c, Test/D04parameter.ztst: use of (#m)
was broken with pure strings.
* users/10564: Completion/Unix/Command/_gpg: use appropriate
key ring arguments to search key rings.

26
Src/pattern.c
View File

@ -1915,6 +1915,32 @@ pattryrefs(Patprog prog, char *string, int stringlen, int unmetalen,
patinlen = (int)prog->patmlen;
/* if matching files, must update globbing flags */
patglobflags = prog->globend;
if ((patglobflags & GF_MATCHREF) &&
!(patflags & PAT_FILE)) {
char *str = ztrduppfx(patinstart, patinlen);
char *ptr = patinstart;
int mlen = 0;
/*
* Count the characters. We're not using CHARSUB()
* because the string is still metafied. We're
* not using mb_metastrlen() because that expects
* the string to be null terminated.
*/
MB_METACHARINIT();
while (ptr < patinstart + patinlen) {
mlen++;
ptr += MB_METACHARLEN(ptr);
}
setsparam("MATCH", str);
setiparam("MBEGIN",
(zlong)(patoffset + !isset(KSHARRAYS)));
setiparam("MEND",
(zlong)(mlen + patoffset +
!isset(KSHARRAYS) - 1));
}
}
}