diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-07-09 16:59:05 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-07-09 16:59:05 +0000 |
| commit | cb052e4f6cc723bc408f32963e921705f3286c94 (patch) | |
| tree | d6f6172f7cff8f5c44f9ae557a525e4b1baf277b /lib/mbswidth.c | |
| parent | 28edf6a75ef4f95e18da5b506bdcf122a53ca3ec (diff) | |
| download | coreutils-cb052e4f6cc723bc408f32963e921705f3286c94.tar.xz | |
Update from gnulib.
Diffstat (limited to 'lib/mbswidth.c')
| -rw-r--r-- | lib/mbswidth.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/lib/mbswidth.c b/lib/mbswidth.c index ef8398a78..48da6639d 100644 --- a/lib/mbswidth.c +++ b/lib/mbswidth.c @@ -60,18 +60,6 @@ # endif #endif -/* Get ISPRINT. */ -#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) -# define IN_CTYPE_DOMAIN(c) 1 -#else -# define IN_CTYPE_DOMAIN(c) isascii(c) -#endif -/* Undefine to protect against the definition in wctype.h of Solaris 2.6. */ -#undef ISPRINT -#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c)) -#undef ISCNTRL -#define ISCNTRL(c) (IN_CTYPE_DOMAIN (c) && iscntrl (c)) - /* Returns the number of columns needed to represent the multibyte character string pointed to by STRING. If a non-printable character occurs, and MBSW_REJECT_UNPRINTABLE is specified, -1 is returned. @@ -195,10 +183,10 @@ mbsnwidth (const char *string, size_t nbytes, int flags) { unsigned char c = (unsigned char) *p++; - if (ISPRINT (c)) + if (isprint (c)) width++; else if (!(flags & MBSW_REJECT_UNPRINTABLE)) - width += (ISCNTRL (c) ? 0 : 1); + width += (iscntrl (c) ? 0 : 1); else return -1; } |