X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbswidth.c;h=0f380a9dcc378fa06e17656a692ce9d9c868e445;hb=31dbe6deb4fe2dbafce6c5243cdb645618417efc;hp=09777c5b5ee3e1fb34b521c60e7b3d2ced34c4a3;hpb=ec482f5cb9a59b3b8d5eb6263bc690983986d1ed;p=gnulib.git
diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index 09777c5b5..0f380a9dc 100644
--- a/lib/mbswidth.c
+++ b/lib/mbswidth.c
@@ -1,10 +1,10 @@
/* Determine the number of screen columns needed for a string.
- Copyright (C) 2000 Free Software Foundation, Inc.
+ Copyright (C) 2000-2008 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,92 +12,54 @@
GNU General Public License for more details.
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. */
+ along with this program. If not, see . */
/* Written by Bruno Haible . */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
-/* Get MB_LEN_MAX. */
-#if HAVE_LIMITS_H
-# include
-#endif
+/* Specification. */
+#include "mbswidth.h"
/* Get MB_CUR_MAX. */
-#if HAVE_STDLIB_H
-# include
-#endif
+#include
-#if HAVE_STRING_H
-# include
-#endif
+#include
/* Get isprint(). */
#include
/* Get mbstate_t, mbrtowc(), mbsinit(), wcwidth(). */
-#if HAVE_WCHAR_H
-# include
-#endif
-
-/* Get iswprint(). */
-#if HAVE_WCTYPE_H
-# include
-#endif
-#if !defined iswprint && !HAVE_ISWPRINT
-# define iswprint(wc) 1
-#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
-#endif
-
-#ifndef HAVE_DECL_WCWIDTH
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_WCWIDTH
-int wcwidth ();
-#endif
-
-#ifndef wcwidth
-# if !HAVE_WCWIDTH
-/* wcwidth doesn't exist, so assume all printable characters have
- width 1. */
-# define wcwidth(wc) ((wc) == 0 ? 0 : iswprint (wc) ? 1 : -1)
-# else
-# endif
-#endif
-
-/* Get ISPRINT. */
-#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-/* Undefine to protect against the definition in wctype.h of solaris2.6. */
-# undef ISASCII
-# define ISASCII(c) 1
-#else
-# define ISASCII(c) isascii (c)
-#endif
-/* Undefine to protect against the definition in wctype.h of solaris2.6. */
-#undef ISPRINT
-#define ISPRINT(c) (ISASCII (c) && isprint (c))
+#include
+
+/* Get iswcntrl(). */
+#include
/* 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.
- 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)
+mbswidth (const char *string, int flags)
+{
+ return mbsnwidth (string, strlen (string), 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, 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)
{
const char *p = string;
- const char *plimit = p + strlen (p);
+ const char *plimit = p + nbytes;
int width;
width = 0;
-#if HAVE_MBRTOWC && (MB_LEN_MAX > 1)
if (MB_CUR_MAX > 1)
{
while (p < plimit)
@@ -127,8 +89,6 @@ mbswidth (const char *string)
p++;
width++;
break;
- case '\0':
- break;
default:
/* If we have a multibyte sequence, scan it up to its end. */
{
@@ -137,20 +97,40 @@ mbswidth (const char *string)
do
{
wchar_t wc;
- size_t bytes = mbrtowc (&wc, p, plimit - p, &mbstate);
+ size_t bytes;
int w;
- if (bytes == 0)
- /* A null wide character was encountered. */
- break;
+ bytes = mbrtowc (&wc, p, plimit - p, &mbstate);
if (bytes == (size_t) -1)
/* An invalid multibyte sequence was encountered. */
- return -1;
+ {
+ if (!(flags & MBSW_REJECT_INVALID))
+ {
+ p++;
+ width++;
+ break;
+ }
+ else
+ return -1;
+ }
if (bytes == (size_t) -2)
/* An incomplete multibyte character at the end. */
- return -1;
+ {
+ if (!(flags & MBSW_REJECT_INVALID))
+ {
+ p = plimit;
+ width++;
+ break;
+ }
+ else
+ return -1;
+ }
+
+ if (bytes == 0)
+ /* A null wide character was encountered. */
+ bytes = 1;
w = wcwidth (wc);
if (w >= 0)
@@ -158,7 +138,10 @@ mbswidth (const char *string)
width += w;
else
/* An unprintable multibyte character. */
- return -1;
+ if (!(flags & MBSW_REJECT_UNPRINTABLE))
+ width += (iswcntrl (wc) ? 0 : 1);
+ else
+ return -1;
p += bytes;
}
@@ -168,17 +151,15 @@ mbswidth (const char *string)
}
return width;
}
-#endif
while (p < plimit)
{
unsigned char c = (unsigned char) *p++;
- if (c == '\0')
- break;
-
- if (ISPRINT (c))
+ if (isprint (c))
width++;
+ else if (!(flags & MBSW_REJECT_UNPRINTABLE))
+ width += (iscntrl (c) ? 0 : 1);
else
return -1;
}