annotate lib/mbswidth.c @ 3174:a8a0896a6027

(mbrtowc, mbsinit): Remove workaround macros for hosts that have mbrtowc but not mbstate_t, as we now insist on proper declarations for both before using mbrtowc.
author Jim Meyering <jim@meyering.net>
date Sat, 17 Feb 2001 10:39:17 +0000
parents f37a719abeac
children 591c68289197
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2757
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
1 /* Determine the number of screen columns needed for a string.
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
2 Copyright (C) 2000 Free Software Foundation, Inc.
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
3
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
4 This program is free software; you can redistribute it and/or modify
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
5 it under the terms of the GNU General Public License as published by
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
6 the Free Software Foundation; either version 2, or (at your option)
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
7 any later version.
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
8
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
9 This program is distributed in the hope that it will be useful,
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
10 but WITHOUT ANY WARRANTY; without even the implied warranty of
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
12 GNU General Public License for more details.
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
13
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
14 You should have received a copy of the GNU General Public License
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
15 along with this program; if not, write to the Free Software Foundation,
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
16 Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
17
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
18 /* Written by Bruno Haible <haible@clisp.cons.org>. */
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
19
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
20 #ifdef HAVE_CONFIG_H
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
21 # include <config.h>
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
22 #endif
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
23
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
24 /* Get MB_LEN_MAX. */
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
25 #if HAVE_LIMITS_H
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
26 # include <limits.h>
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
27 #endif
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
28
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
29 /* Get MB_CUR_MAX. */
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
30 #if HAVE_STDLIB_H
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
31 # include <stdlib.h>
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
32 #endif
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
33
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
34 #if HAVE_STRING_H
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
35 # include <string.h>
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
36 #endif
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
37
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
38 /* Get isprint(). */
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
39 #include <ctype.h>
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
40
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
41 /* Get mbstate_t, mbrtowc(), mbsinit(), wcwidth(). */
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
42 #if HAVE_WCHAR_H
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
43 # include <wchar.h>
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
44 #endif
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
45
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
46 /* Get iswprint(). */
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
47 #if HAVE_WCTYPE_H
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
48 # include <wctype.h>
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
49 #endif
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
50 #if !defined iswprint && !HAVE_ISWPRINT
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
51 # define iswprint(wc) 1
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
52 #endif
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
53
2772
ec142580c1ee (_XOPEN_SOURCE): Don't define; this causes problems on Solaris 7.
Jim Meyering <jim@meyering.net>
parents: 2757
diff changeset
54 #ifndef HAVE_DECL_WCWIDTH
ec142580c1ee (_XOPEN_SOURCE): Don't define; this causes problems on Solaris 7.
Jim Meyering <jim@meyering.net>
parents: 2757
diff changeset
55 "this configure-time declaration test was not run"
ec142580c1ee (_XOPEN_SOURCE): Don't define; this causes problems on Solaris 7.
Jim Meyering <jim@meyering.net>
parents: 2757
diff changeset
56 #endif
ec142580c1ee (_XOPEN_SOURCE): Don't define; this causes problems on Solaris 7.
Jim Meyering <jim@meyering.net>
parents: 2757
diff changeset
57 #if !HAVE_DECL_WCWIDTH
ec142580c1ee (_XOPEN_SOURCE): Don't define; this causes problems on Solaris 7.
Jim Meyering <jim@meyering.net>
parents: 2757
diff changeset
58 int wcwidth ();
ec142580c1ee (_XOPEN_SOURCE): Don't define; this causes problems on Solaris 7.
Jim Meyering <jim@meyering.net>
parents: 2757
diff changeset
59 #endif
ec142580c1ee (_XOPEN_SOURCE): Don't define; this causes problems on Solaris 7.
Jim Meyering <jim@meyering.net>
parents: 2757
diff changeset
60
ec142580c1ee (_XOPEN_SOURCE): Don't define; this causes problems on Solaris 7.
Jim Meyering <jim@meyering.net>
parents: 2757
diff changeset
61 #ifndef wcwidth
ec142580c1ee (_XOPEN_SOURCE): Don't define; this causes problems on Solaris 7.
Jim Meyering <jim@meyering.net>
parents: 2757
diff changeset
62 # if !HAVE_WCWIDTH
ec142580c1ee (_XOPEN_SOURCE): Don't define; this causes problems on Solaris 7.
Jim Meyering <jim@meyering.net>
parents: 2757
diff changeset
63 /* wcwidth doesn't exist, so assume all printable characters have
2757
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
64 width 1. */
2772
ec142580c1ee (_XOPEN_SOURCE): Don't define; this causes problems on Solaris 7.
Jim Meyering <jim@meyering.net>
parents: 2757
diff changeset
65 # define wcwidth(wc) ((wc) == 0 ? 0 : iswprint (wc) ? 1 : -1)
ec142580c1ee (_XOPEN_SOURCE): Don't define; this causes problems on Solaris 7.
Jim Meyering <jim@meyering.net>
parents: 2757
diff changeset
66 # endif
2757
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
67 #endif
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
68
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
69 /* Get ISPRINT. */
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
70 #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
2856
21b199ffea14 Rename ISASCII to IN_CTYPE_DOMAIN.
Jim Meyering <jim@meyering.net>
parents: 2775
diff changeset
71 # define IN_CTYPE_DOMAIN(c) 1
2757
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
72 #else
2856
21b199ffea14 Rename ISASCII to IN_CTYPE_DOMAIN.
Jim Meyering <jim@meyering.net>
parents: 2775
diff changeset
73 # define IN_CTYPE_DOMAIN(c) isascii(c)
2757
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
74 #endif
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
75 /* Undefine to protect against the definition in wctype.h of solaris2.6. */
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
76 #undef ISPRINT
2856
21b199ffea14 Rename ISASCII to IN_CTYPE_DOMAIN.
Jim Meyering <jim@meyering.net>
parents: 2775
diff changeset
77 #define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c))
2757
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
78
2775
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
79 #include "mbswidth.h"
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
80
2757
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
81 /* Returns the number of columns needed to represent the multibyte
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
82 character string pointed to by STRING. If a non-printable character
2775
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
83 occurs, -1 is returned, unless MBSW_ACCEPT_UNPRINTABLE is specified.
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
84 With flags = 0, this is the multibyte analogon of the wcswidth function. */
2757
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
85 int
2775
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
86 mbswidth (const char *string, int flags)
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
87 {
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
88 return mbsnwidth (string, strlen (string), flags);
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
89 }
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
90
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
91 /* Returns the number of columns needed to represent the multibyte
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
92 character string pointed to by STRING of length NBYTES. If a
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
93 non-printable character occurs, -1 is returned, unless
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
94 MBSW_ACCEPT_UNPRINTABLE is specified. */
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
95 int
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
96 mbsnwidth (const char *string, size_t nbytes, int flags)
2757
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
97 {
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
98 const char *p = string;
2775
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
99 const char *plimit = p + nbytes;
2757
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
100 int width;
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
101
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
102 width = 0;
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
103 #if HAVE_MBRTOWC && (MB_LEN_MAX > 1)
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
104 if (MB_CUR_MAX > 1)
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
105 {
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
106 while (p < plimit)
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
107 switch (*p)
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
108 {
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
109 case ' ': case '!': case '"': case '#': case '%':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
110 case '&': case '\'': case '(': case ')': case '*':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
111 case '+': case ',': case '-': case '.': case '/':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
112 case '0': case '1': case '2': case '3': case '4':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
113 case '5': case '6': case '7': case '8': case '9':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
114 case ':': case ';': case '<': case '=': case '>':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
115 case '?':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
116 case 'A': case 'B': case 'C': case 'D': case 'E':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
117 case 'F': case 'G': case 'H': case 'I': case 'J':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
118 case 'K': case 'L': case 'M': case 'N': case 'O':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
119 case 'P': case 'Q': case 'R': case 'S': case 'T':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
120 case 'U': case 'V': case 'W': case 'X': case 'Y':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
121 case 'Z':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
122 case '[': case '\\': case ']': case '^': case '_':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
123 case 'a': case 'b': case 'c': case 'd': case 'e':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
124 case 'f': case 'g': case 'h': case 'i': case 'j':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
125 case 'k': case 'l': case 'm': case 'n': case 'o':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
126 case 'p': case 'q': case 'r': case 's': case 't':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
127 case 'u': case 'v': case 'w': case 'x': case 'y':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
128 case 'z': case '{': case '|': case '}': case '~':
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
129 /* These characters are printable ASCII characters. */
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
130 p++;
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
131 width++;
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
132 break;
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
133 default:
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
134 /* If we have a multibyte sequence, scan it up to its end. */
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
135 {
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
136 mbstate_t mbstate;
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
137 memset (&mbstate, 0, sizeof mbstate);
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
138 do
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
139 {
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
140 wchar_t wc;
2775
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
141 size_t bytes;
2757
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
142 int w;
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
143
2775
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
144 bytes = mbrtowc (&wc, p, plimit - p, &mbstate);
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
145
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
146 if (bytes == (size_t) -1)
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
147 /* An invalid multibyte sequence was encountered. */
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
148 {
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
149 if (flags & MBSW_ACCEPT_INVALID)
3043
f37a719abeac (mbsnwidth): Don't loop endlessly when called with an
Jim Meyering <jim@meyering.net>
parents: 2856
diff changeset
150 {
f37a719abeac (mbsnwidth): Don't loop endlessly when called with an
Jim Meyering <jim@meyering.net>
parents: 2856
diff changeset
151 p++;
f37a719abeac (mbsnwidth): Don't loop endlessly when called with an
Jim Meyering <jim@meyering.net>
parents: 2856
diff changeset
152 width++;
f37a719abeac (mbsnwidth): Don't loop endlessly when called with an
Jim Meyering <jim@meyering.net>
parents: 2856
diff changeset
153 break;
f37a719abeac (mbsnwidth): Don't loop endlessly when called with an
Jim Meyering <jim@meyering.net>
parents: 2856
diff changeset
154 }
2775
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
155 else
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
156 return -1;
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
157 }
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
158
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
159 if (bytes == (size_t) -2)
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
160 /* An incomplete multibyte character at the end. */
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
161 {
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
162 if (flags & MBSW_ACCEPT_INVALID)
3043
f37a719abeac (mbsnwidth): Don't loop endlessly when called with an
Jim Meyering <jim@meyering.net>
parents: 2856
diff changeset
163 {
f37a719abeac (mbsnwidth): Don't loop endlessly when called with an
Jim Meyering <jim@meyering.net>
parents: 2856
diff changeset
164 p = plimit;
f37a719abeac (mbsnwidth): Don't loop endlessly when called with an
Jim Meyering <jim@meyering.net>
parents: 2856
diff changeset
165 width++;
f37a719abeac (mbsnwidth): Don't loop endlessly when called with an
Jim Meyering <jim@meyering.net>
parents: 2856
diff changeset
166 break;
f37a719abeac (mbsnwidth): Don't loop endlessly when called with an
Jim Meyering <jim@meyering.net>
parents: 2856
diff changeset
167 }
2775
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
168 else
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
169 return -1;
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
170 }
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
171
2757
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
172 if (bytes == 0)
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
173 /* A null wide character was encountered. */
2775
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
174 bytes = 1;
2757
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
175
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
176 w = wcwidth (wc);
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
177 if (w >= 0)
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
178 /* A printable multibyte character. */
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
179 width += w;
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
180 else
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
181 /* An unprintable multibyte character. */
2775
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
182 if (flags & MBSW_ACCEPT_UNPRINTABLE)
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
183 width += 1;
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
184 else
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
185 return -1;
2757
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
186
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
187 p += bytes;
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
188 }
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
189 while (! mbsinit (&mbstate));
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
190 }
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
191 break;
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
192 }
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
193 return width;
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
194 }
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
195 #endif
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
196
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
197 while (p < plimit)
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
198 {
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
199 unsigned char c = (unsigned char) *p++;
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
200
2775
afd68d0b9fc1 (mbswidth): Add a flags argument.
Jim Meyering <jim@meyering.net>
parents: 2772
diff changeset
201 if ((flags & MBSW_ACCEPT_UNPRINTABLE) || ISPRINT (c))
2757
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
202 width++;
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
203 else
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
204 return -1;
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
205 }
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
206 return width;
0d95df8533b0 from Bruno Haible.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
207 }