/* Determine the number of screen columns needed for a string.
- Copyright (C) 2000 Free Software Foundation, Inc.
+ Copyright (C) 2000-2005 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* Written by Bruno Haible <haible@clisp.cons.org>. */
# include <config.h>
#endif
-/* Get MB_LEN_MAX. */
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
+/* Specification. */
+#include "mbswidth.h"
/* Get MB_CUR_MAX. */
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
-#if HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
/* Get isprint(). */
#include <ctype.h>
/* Get mbstate_t, mbrtowc(), mbsinit(), wcwidth(). */
#if HAVE_WCHAR_H
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+ <wchar.h>.
+ BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before
+ <wchar.h>. */
+# include <stdio.h>
+# include <time.h>
# include <wchar.h>
#endif
-/* Get iswprint(). */
+/* Get iswprint(), iswcntrl(). */
#if HAVE_WCTYPE_H
# include <wctype.h>
#endif
#if !defined iswprint && !HAVE_ISWPRINT
# define iswprint(wc) 1
#endif
+#if !defined iswcntrl && !HAVE_ISWCNTRL
+# define iswcntrl(wc) 0
+#endif
-/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */
-#if HAVE_MBRTOWC && defined mbstate_t
-# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)
-# define mbsinit(ps) 1
+#ifndef mbsinit
+# if !HAVE_MBSINIT
+# define mbsinit(ps) 1
+# endif
#endif
#ifndef HAVE_DECL_WCWIDTH
#else
# define IN_CTYPE_DOMAIN(c) isascii(c)
#endif
-/* Undefine to protect against the definition in wctype.h of solaris2.6. */
+/* Undefine to protect against the definition in wctype.h of Solaris 2.6. */
#undef ISPRINT
#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c))
-
-#include "mbswidth.h"
+#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, -1 is returned, unless MBSW_ACCEPT_UNPRINTABLE is specified.
- With flags = 0, this is the multibyte analogon of the wcswidth function. */
+ occurs, and MBSW_REJECT_UNPRINTABLE is specified, -1 is returned.
+ With flags = MBSW_REJECT_INVALID | MBSW_REJECT_UNPRINTABLE, this is
+ the multibyte analogue of the wcswidth function.
+ If STRING is not of length < INT_MAX / 2, integer overflow can occur. */
int
mbswidth (const char *string, int flags)
{
/* Returns the number of columns needed to represent the multibyte
character string pointed to by STRING of length NBYTES. If a
- non-printable character occurs, -1 is returned, unless
- MBSW_ACCEPT_UNPRINTABLE is specified. */
+ non-printable character occurs, and MBSW_REJECT_UNPRINTABLE is
+ specified, -1 is returned.
+ If NBYTES is not < INT_MAX / 2, integer overflow can occur. */
int
mbsnwidth (const char *string, size_t nbytes, int flags)
{
int width;
width = 0;
-#if HAVE_MBRTOWC && (MB_LEN_MAX > 1)
+#if HAVE_MBRTOWC
if (MB_CUR_MAX > 1)
{
while (p < plimit)
if (bytes == (size_t) -1)
/* An invalid multibyte sequence was encountered. */
{
- if (flags & MBSW_ACCEPT_INVALID)
- break;
+ if (!(flags & MBSW_REJECT_INVALID))
+ {
+ p++;
+ width++;
+ break;
+ }
else
return -1;
}
if (bytes == (size_t) -2)
/* An incomplete multibyte character at the end. */
{
- if (flags & MBSW_ACCEPT_INVALID)
- break;
+ if (!(flags & MBSW_REJECT_INVALID))
+ {
+ p = plimit;
+ width++;
+ break;
+ }
else
return -1;
}
width += w;
else
/* An unprintable multibyte character. */
- if (flags & MBSW_ACCEPT_UNPRINTABLE)
- width += 1;
+ if (!(flags & MBSW_REJECT_UNPRINTABLE))
+ width += (iswcntrl (wc) ? 0 : 1);
else
return -1;
{
unsigned char c = (unsigned char) *p++;
- if ((flags & MBSW_ACCEPT_UNPRINTABLE) || ISPRINT (c))
+ if (ISPRINT (c))
width++;
+ else if (!(flags & MBSW_REJECT_UNPRINTABLE))
+ width += (ISCNTRL (c) ? 0 : 1);
else
return -1;
}