mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-11-01 18:30:55 +01:00
Code Releases Activity

rationalise mb<->wc conversions to use restartable form

Browse source
This commit is contained in:
Peter Stephenson 2006-08-03 15:37:49 +00:00
parent 07f11ba6bf
commit 48d6402e65
7 changed files with 56 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Src/Zle/zle_utils.c
View file

@ -135,17 +135,20 @@ zlelineasstring(ZLE_STRING_T instr, int inll, int incs, int *outllp,
char *s;
int i, j;
size_t mb_len = 0;
mbstate_t mbs;
s = zalloc(inll * MB_CUR_MAX + 1);
outcs = 0;
memset(&mbs, 0, sizeof(mbs));
for (i=0; i < inll; i++, incs--) {
if (incs == 0)
outcs = mb_len;
j = wctomb(s + mb_len, instr[i]);
j = wcrtomb(s + mb_len, instr[i], &mbs);
if (j == -1) {
/* invalid char; what to do? */
s[mb_len++] = ZWC('?');
memset(&mbs, 0, sizeof(mbs));
} else {
mb_len += j;
}
@ -780,6 +783,7 @@ showmsg(char const *msg)
p = unmetafy(umsg, &ulen);
memset(&mbs, 0, sizeof mbs);
mb_metacharinit();
while (ulen > 0) {
char const *n;
if (*p == '\n') {