From 0abdec4fa34283821f14548c0aa97e52b5c8a0eb Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Tue, 21 Sep 1999 01:33:28 +0000 Subject: zsh-workers/7948 --- Src/pattern.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Src/pattern.c') diff --git a/Src/pattern.c b/Src/pattern.c index 63551967f..3b226c92f 100644 --- a/Src/pattern.c +++ b/Src/pattern.c @@ -1335,15 +1335,15 @@ pattry(Patprog prog, char *string) * in the pattern matching part. */ char *str; - int len = patinput - patinstart; + int mlen = ztrsub(patinput, patinstart); PERMALLOC { - str = dupstrpfx(patinstart, len); + str = dupstrpfx(patinstart, patinput - patinstart); } LASTALLOC; setsparam("MATCH", str); setiparam("MBEGIN", (zlong)(patoffset + !isset(KSHARRAYS))); setiparam("MEND", - (zlong)(len + patoffset + !isset(KSHARRAYS) - 1)); + (zlong)(mlen + patoffset + !isset(KSHARRAYS) - 1)); } if (prog->patnpar && !(patflags & PAT_FILE)) { /* @@ -1374,11 +1374,11 @@ pattry(Patprog prog, char *string) * corresponds to indexing as ${foo[1,1]}. */ sprintf(numbuf, "%ld", - (long)((*sp - patinstart) + patoffset + + (long)(ztrsub(*sp, patinstart) + patoffset + !isset(KSHARRAYS))); mbeginarr[i] = ztrdup(numbuf); sprintf(numbuf, "%ld", - (long)((*ep - patinstart) + patoffset + + (long)(ztrsub(*ep, patinstart) + patoffset + !isset(KSHARRAYS) - 1)); mendarr[i] = ztrdup(numbuf); sp++; -- cgit 1.4.1