JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix that as well

Browse Source
This commit is contained in:
tg
2009-11-21 22:32:08 +00:00
parent 6e67920bef
commit 398b5b7a60
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
eval.c
View File

@ -22,7 +22,7 @@
#include "sh.h"
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.71 2009/11/21 22:29:11 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.72 2009/11/21 22:32:08 tg Exp $");
/*
* string expansion
@ -1137,7 +1137,7 @@ trimsub(char *str, char *pat, int how)
switch (how & 0xFF) {
case '#': /* shortest at beginning */
for (p = str; p <= end; p++) {
for (p = str; p <= end; p += utf_ptradj(p)) {
c = *p; *p = '\0';
if (gmatchx(str, pat, false)) {
*p = c;
@ -1157,18 +1157,28 @@ trimsub(char *str, char *pat, int how)
}
break;
case '%': /* shortest match at end */
for (p = end; p >= str; p--)
p = end;
while (p >= str) {
if (gmatchx(p, pat, false))
goto trimsub_match;
if (UTFMODE) {
char *op = p;
while ((*--p & 0xC0) == 0x80)
;
if ((p < str) || (p + utf_ptradj(p) != op))
p = op - 1;
} else
--p;
}
break;
case '%'|0x80: /* longest match at end */
for (p = str; p <= end; p++)
if (gmatchx(p, pat, false)) {
trimsub_match:
strndupx(end, str, p - str, ATEMP);
return (end);
}
break;
case '%'|0x80: /* longest match at end */
for (p = str; p <= end; p++)
if (gmatchx(p, pat, false))
goto trimsub_match;
break;
}
return (str); /* no match, return string */