Print this page
2964 need POSIX 2008 locale object support
Reviewed by: Robert Mustacchi <rm@joyent.com>
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/lib/libc/port/locale/wcwidth.c
+++ new/usr/src/lib/libc/port/locale/wcwidth.c
1 1 /*
2 + * Copyright 2013 Garrett D'Amore <garrett@damore.org>
2 3 * Copyright (c) 1989, 1993
3 4 * The Regents of the University of California. All rights reserved.
4 5 * (c) UNIX System Laboratories, Inc.
5 6 * All or some portions of this file are derived from material licensed
6 7 * to the University of California by American Telephone and Telegraph
7 8 * Co. or Unix System Laboratories, Inc. and are reproduced herein with
8 9 * the permission of UNIX System Laboratories, Inc.
9 10 *
10 11 * This code is derived from software contributed to Berkeley by
11 12 * Paul Borman at Krystal Technologies.
12 13 *
13 14 * Redistribution and use in source and binary forms, with or without
14 15 * modification, are permitted provided that the following conditions
15 16 * are met:
16 17 * 1. Redistributions of source code must retain the above copyright
17 18 * notice, this list of conditions and the following disclaimer.
18 19 * 2. Redistributions in binary form must reproduce the above copyright
19 20 * notice, this list of conditions and the following disclaimer in the
20 21 * documentation and/or other materials provided with the distribution.
21 22 * 4. Neither the name of the University nor the names of its contributors
22 23 * may be used to endorse or promote products derived from this software
23 24 * without specific prior written permission.
24 25 *
25 26 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
26 27 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
27 28 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
28 29 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
29 30 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
30 31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
31 32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 36 * SUCH DAMAGE.
36 37 */
↓ open down ↓ |
25 lines elided |
↑ open up ↑ |
37 38
38 39 /*
39 40 * Copyright 2010 Nexenta Systems, Inc. All rights reserved.
40 41 * Use is subject to license terms.
41 42 */
42 43
43 44 #include "lint.h"
44 45 #include <wchar.h>
45 46 #include "_ctype.h"
46 47 #include "runetype.h"
48 +#include "localeimpl.h"
47 49
48 50 #undef wcwidth
49 51
50 52 int
51 -wcwidth(wchar_t wc)
53 +wcwidth_l(wchar_t wc, locale_t loc)
52 54 {
53 55 unsigned int x;
56 + const _RuneLocale *rl = loc->runelocale;
54 57
55 58 if (wc == 0)
56 59 return (0);
57 60
58 - x = ((wc < 0 || wc >= _CACHED_RUNES) ? ___runetype(wc) :
59 - _CurrentRuneLocale->__runetype[wc]) & (_CTYPE_SWM|_CTYPE_R);
61 + x = ((wc < 0 || wc >= _CACHED_RUNES) ? __runetype(rl, wc) :
62 + rl->__runetype[wc]) & (_CTYPE_SWM|_CTYPE_R);
60 63
61 64 if ((x & _CTYPE_SWM) != 0)
62 65 return ((x & _CTYPE_SWM) >> _CTYPE_SWS);
63 66 return ((x & _CTYPE_R) != 0 ? 1 : -1);
64 67 }
65 68
69 +int
70 +wcwidth(wchar_t wc)
71 +{
72 + return (wcwidth_l(wc, uselocale(NULL)));
73 +}
74 +
66 75 #pragma weak _scrwidth = scrwidth
67 76
68 77 /*
69 78 * This is a Solaris extension. It never returns a negative width, even for
70 79 * non-printable characters. It is used internally by the printf
71 80 * implementation for %ws.
72 81 */
73 82 int
74 83 scrwidth(wchar_t wc)
75 84 {
76 85 int v = wcwidth(wc);
77 86 return (v > 0 ? v : 0);
78 87 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX