mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-06-11 07:08:07 +02:00
Code Releases Activity

52597: fix character counts in context of operator and operand errors

Browse source
This commit is contained in:
Bart Schaefer 2024-02-24 21:16:15 -08:00
parent 69c0c646bb
commit 6c50d15562
2 changed files with 21 additions and 7 deletions

3
ChangeLog
View file

@ -1,5 +1,8 @@
2024-02-24 Bart Schaefer <schaefer@zsh.org> 2024-02-24 Bart Schaefer <schaefer@zsh.org>
* 52597: Src/math.c: fix multibyte and metafied character counts
when providing context for operator and operand errors
* 52596: Src/exec.c: metafy interpreter name for error message * 52596: Src/exec.c: metafy interpreter name for error message
* Stephane: 52591: Src/builtin.c: printf builtin must pass * Stephane: 52591: Src/builtin.c: printf builtin must pass

25
Src/math.c
View file

@ -1557,21 +1557,32 @@ checkunary(int mtokc, char *mptr)
errmsg = 2; errmsg = 2;
} }
if (errmsg) { if (errmsg) {
int len, over = 0; int len = 0, over = 0;
char *errtype = errmsg == 2 ? "operator" : "operand"; char *errtype = errmsg == 2 ? "operator" : "operand";
while (inblank(*mptr)) while (inblank(*mptr))
mptr++; mptr++;
len = ztrlen(mptr); if (isset(MULTIBYTE))
if (len > 10) { MB_CHARINIT();
len = 10; while (over < 10 && mptr[len]) {
over = 1; if (isset(MULTIBYTE))
len += MB_METACHARLEN(mptr+len);
else
len += (mptr[len] == Meta ? 2 : 1);
++over;
}
if ((over = mptr[len])) {
mptr = dupstring(mptr);
if (mptr[len] == Meta)
mptr[len+1] = 0;
else
mptr[len] = 0;
} }
if (!*mptr) if (!*mptr)
zerr("bad math expression: %s expected at end of string", zerr("bad math expression: %s expected at end of string",
errtype); errtype);
else else
zerr("bad math expression: %s expected at `%l%s'", zerr("bad math expression: %s expected at `%s%s'",
errtype, mptr, len, over ? "..." : ""); errtype, mptr, over ? "..." : "");
} }
unary = !(tp & OP_OPF); unary = !(tp & OP_OPF);
} }