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

thinko: multibyte characters are not always 1 column wide

Browse Source
This commit is contained in:
tg
2008-05-02 18:55:37 +00:00
parent 1ed64c3e26
commit 4230cf91de
5 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
var.c
View File

@ -2,7 +2,7 @@
#include "sh.h"
__RCSID("$MirOS: src/bin/mksh/var.c,v 1.54 2008/04/19 22:15:06 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/var.c,v 1.55 2008/05/02 18:55:37 tg Exp $");
/*
* Variables
@ -525,14 +525,14 @@ formatstr(struct tbl *vp, const char *s)
p = (char *)alloc((psiz = nlen * /* MB_LEN_MAX */ 3 + 1), ATEMP);
if (vp->flag & (RJUST|LJUST)) {
int slen = olen, i;
int slen = olen, i = 0;
if (vp->flag & RJUST) {
const char *qq = s;
int n = 0;
for (i = 0; i < slen; ++i)
utf_widthadj(qq, &qq);
while (i < slen)
i += utf_widthadj(qq, &qq);
/* strip trailing spaces (at&t uses qq[-1] == ' ') */
while (qq > s && ksh_isspace(qq[-1])) {
--qq;
@ -550,10 +550,8 @@ formatstr(struct tbl *vp, const char *s)
memcpy(p, s, n);
s += n;
}
while (slen > vp->u2.field) {
utf_widthadj(s, &s);
--slen;
}
while (slen > vp->u2.field)
slen -= utf_widthadj(s, &s);
if (vp->u2.field - slen)
memset(p + n, (vp->flag & ZEROFIL) ? '0' : ' ',
vp->u2.field - slen);