fix utf_widthadj/utf_skipcols handling for the remaining cases I can spot

This commit is contained in:
tg
2016-05-05 22:56:15 +00:00
parent 3d130b606a
commit 92833fc6ce
5 changed files with 23 additions and 16 deletions

6
sh.h
View File

@@ -175,9 +175,9 @@
#endif
#ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.770 2016/04/14 15:38:38 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.771 2016/05/05 22:56:14 tg Exp $");
#endif
#define MKSH_VERSION "R52 2016/04/14"
#define MKSH_VERSION "R52 2016/05/05"
/* arithmetic types: C implementation */
#if !HAVE_CAN_INTTYPES
@@ -1756,7 +1756,7 @@ size_t utf_mbtowc(unsigned int *, const char *);
size_t utf_wctomb(char *, unsigned int);
int utf_widthadj(const char *, const char **);
size_t utf_mbswidth(const char *) MKSH_A_PURE;
const char *utf_skipcols(const char *, int) MKSH_A_PURE;
const char *utf_skipcols(const char *, int, int *);
size_t utf_ptradj(const char *) MKSH_A_PURE;
#ifdef MIRBSD_BOOTFLOPPY
#define utf_wcwidth(i) wcwidth((wchar_t)(i))