projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mkfifoat: use new modules for Solaris and BSD bugs
[gnulib.git]
/
lib
/
mbswidth.c
diff --git
a/lib/mbswidth.c
b/lib/mbswidth.c
index
0bc1a68
..
0f380a9
100644
(file)
--- a/
lib/mbswidth.c
+++ b/
lib/mbswidth.c
@@
-1,10
+1,10
@@
/* Determine the number of screen columns needed for a string.
/* Determine the number of screen columns needed for a string.
- Copyright (C) 2000-200
7
Free Software Foundation, Inc.
+ Copyright (C) 2000-200
8
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
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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-12,8
+12,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Written by Bruno Haible <haible@clisp.cons.org>. */
/* Written by Bruno Haible <haible@clisp.cons.org>. */
@@
-30,21
+29,12
@@
/* Get isprint(). */
#include <ctype.h>
/* Get isprint(). */
#include <ctype.h>
-/* Get mbstate_t, mbrtowc(), mbsinit(). */
+/* Get mbstate_t, mbrtowc(), mbsinit()
, wcwidth()
. */
#include <wchar.h>
#include <wchar.h>
-/* Get wcwidth(). */
-#include "wcwidth.h"
-
/* Get iswcntrl(). */
#include <wctype.h>
/* Get iswcntrl(). */
#include <wctype.h>
-#ifndef mbsinit
-# if !HAVE_MBSINIT
-# define mbsinit(ps) 1
-# endif
-#endif
-
/* 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.
/* 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.
@@
-70,7
+60,6
@@
mbsnwidth (const char *string, size_t nbytes, int flags)
int width;
width = 0;
int width;
width = 0;
-#if HAVE_MBRTOWC
if (MB_CUR_MAX > 1)
{
while (p < plimit)
if (MB_CUR_MAX > 1)
{
while (p < plimit)
@@
-162,7
+151,6
@@
mbsnwidth (const char *string, size_t nbytes, int flags)
}
return width;
}
}
return width;
}
-#endif
while (p < plimit)
{
while (p < plimit)
{