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

fix one of the bugs in this code… still the one I’m looking for left

Browse Source
This commit is contained in:
tg
2008-03-01 17:14:17 +00:00
parent 707a787edc
commit 16dd1d3c8f
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eval.c
View File

@ -2,7 +2,7 @@
#include "sh.h"
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.41 2008/02/29 11:51:21 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.42 2008/03/01 17:14:17 tg Exp $");
#ifdef MKSH_SMALL
#define MKSH_NOPWNAM
@ -1026,11 +1026,11 @@ trimsub(char *str, char *pat, int how)
if (!(*d++ = *s++))
break;
} else if (c == '/') {
*d++ = '\0';
rrep = s;
break;
} else
*d++ = c;
*d++ = '\0';
/* do not accept empty pattern */
if (!*rpat) {
afree(rpat, ATEMP);
@ -1058,6 +1058,10 @@ trimsub(char *str, char *pat, int how)
tpat1 = shf_smprintf("%c*%s%c*", MAGIC, rpat, MAGIC);
tpat2 = tpat1 + 2;
}
#if 0
fprintf(stderr, "D: 「%s」 → 〔%s｜%s〕\n", pat, tpat0, rrep);
fflush(stderr);
#endif
again_repl:
/* this would not be necessary if gmatchx would return
* the start and end values of a match found, like re*