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

handle combining characters at the end of the string correctly

Browse Source
This commit is contained in:
tg 2016-05-05 21:33:46 +00:00
parent 2e74da0953
commit 152eee2085
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
expr.c
View File

@ -23,7 +23,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/expr.c,v 1.83 2016/03/01 18:29:38 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/expr.c,v 1.84 2016/05/05 21:33:46 tg Exp $");
/* the order of these enums is constrained by the order of opinfo[] */ /* the order of these enums is constrained by the order of opinfo[] */
enum token { enum token {
@ -812,12 +812,16 @@ const char *
utf_skipcols(const char *p, int cols) utf_skipcols(const char *p, int cols)
{ {
int c = 0; int c = 0;
const char *q;
while (c < cols) { while (c < cols) {
if (!*p) if (!*p)
return (p + cols - c); return (p + cols - c);
c += utf_widthadj(p, &p); c += utf_widthadj(p, &p);
} }
if (UTFMODE)
while (utf_widthadj(p, &q) == 0)
p = q;
return (p); return (p);
} }