X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmbswidth.c;h=0f380a9dcc378fa06e17656a692ce9d9c868e445;hb=298d8b4a29e66da0b046b64b822f97d1c8fef74b;hp=4c79815e53df8ea09fa2a6714b6db6f8941e4d95;hpb=a83726a9f1db54da8af0b87db1e693bf91886ca5;p=gnulib.git
diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index 4c79815e5..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-2005 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,14 +12,11 @@
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
/* Specification. */
#include "mbswidth.h"
@@ -33,59 +30,10 @@
#include
/* Get mbstate_t, mbrtowc(), mbsinit(), wcwidth(). */
-#if HAVE_WCHAR_H
-/* Tru64 with Desktop Toolkit C has a bug: must be included before
- .
- BSD/OS 4.1 has a bug: and must be included before
- . */
-# include
-# include
-# include
-#endif
-
-/* Get iswprint(), iswcntrl(). */
-#if HAVE_WCTYPE_H
-# include
-#endif
-#if !defined iswprint && !HAVE_ISWPRINT
-# define iswprint(wc) 1
-#endif
-#if !defined iswcntrl && !HAVE_ISWCNTRL
-# define iswcntrl(wc) 0
-#endif
-
-#ifndef mbsinit
-# if !HAVE_MBSINIT
-# define mbsinit(ps) 1
-# endif
-#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)
-# 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))
+#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
@@ -112,7 +60,6 @@ mbsnwidth (const char *string, size_t nbytes, int flags)
int width;
width = 0;
-#if HAVE_MBRTOWC
if (MB_CUR_MAX > 1)
{
while (p < plimit)
@@ -204,16 +151,15 @@ mbsnwidth (const char *string, size_t nbytes, int flags)
}
return width;
}
-#endif
while (p < plimit)
{
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;
}