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/mblen.c
+++ new/usr/src/lib/libc/port/locale/mblen.c
1 1 /*
2 + * Copyright 2013 Garrett D'Amore <garrett@damore.org>
2 3 * Copyright 2010 Nexenta Systems, Inc. All rights reserved.
3 4 * Copyright (c) 2002-2004 Tim J. Robbins.
4 5 * All rights reserved.
5 6 *
6 7 * Redistribution and use in source and binary forms, with or without
7 8 * modification, are permitted provided that the following conditions
8 9 * are met:
9 10 * 1. Redistributions of source code must retain the above copyright
10 11 * notice, this list of conditions and the following disclaimer.
11 12 * 2. Redistributions in binary form must reproduce the above copyright
12 13 * notice, this list of conditions and the following disclaimer in the
13 14 * documentation and/or other materials provided with the distribution.
14 15 *
15 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
16 17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17 18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
18 19 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
19 20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
↓ open down ↓ |
9 lines elided |
↑ open up ↑ |
21 22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 26 * SUCH DAMAGE.
26 27 */
27 28
28 29 #include "lint.h"
29 30 #include <stdlib.h>
30 31 #include <wchar.h>
32 +#include <locale.h>
33 +#include <xlocale.h>
31 34 #include "mblocal.h"
35 +#include "localeimpl.h"
32 36
33 37 int
34 -mblen(const char *s, size_t n)
38 +mblen_l(const char *s, size_t n, locale_t loc)
35 39 {
36 40 static const mbstate_t initial = { 0 };
37 41 static mbstate_t mbs;
38 42 size_t rval;
39 43
40 44 if (s == NULL) {
41 45 /* No support for state dependent encodings. */
42 46 mbs = initial;
43 47 return (0);
44 48 }
45 - rval = __mbrtowc(NULL, s, n, &mbs);
49 + rval = mbrtowc_l(NULL, s, n, &mbs, loc);
46 50 if (rval == (size_t)-1 || rval == (size_t)-2)
47 51 return (-1);
48 52 return ((int)rval);
53 +}
54 +
55 +int
56 +mblen(const char *s, size_t n)
57 +{
58 + return (mblen_l(s, n, uselocale(NULL)));
49 59 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX