Print this page
2964 need POSIX 2008 locale object support
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Approved by: TBD
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/lib/libc/port/locale/tolower.c
+++ new/usr/src/lib/libc/port/locale/tolower.c
1 1 /*
2 2 * This file and its contents are supplied under the terms of the
↓ open down ↓ |
2 lines elided |
↑ open up ↑ |
3 3 * Common Development and Distribution License ("CDDL"), version 1.0.
4 4 * You may only use this file in accordance with the terms of version
5 5 * 1.0 of the CDDL.
6 6 *
7 7 * A full copy of the text of the CDDL should have accompanied this
8 8 * source. A copy of the CDDL is also available via the Internet at
9 9 * http://www.illumos.org/license/CDDL.
10 10 */
11 11
12 12 /*
13 + * Copyright 2013 Garrett D'Amore <garrett@damore.org>
13 14 * Copyright 2010 Nexenta Systems, Inc. All rights reserved.
14 15 */
15 16 #include "lint.h"
16 17 #include <ctype.h>
18 +#include <locale.h>
19 +#include "localeimpl.h"
20 +#include "lctype.h"
17 21
18 22 #pragma weak _tolower = tolower
19 23 #pragma weak _toupper = toupper
20 24
21 25 int
26 +tolower_l(int c, locale_t loc)
27 +{
28 + return (((unsigned)c > 255) ? c : loc->ctype->lc_trans_lower[c]);
29 +}
30 +
31 +int
32 +toupper_l(int c, locale_t loc)
33 +{
34 + return (((unsigned)c > 255) ? c : loc->ctype->lc_trans_upper[c]);
35 +}
36 +
37 +#undef tolower
38 +int
22 39 tolower(int c)
23 40 {
24 - return (((unsigned)c > 255) ? c : __trans_lower[c]);
41 + return (isascii(c) ? __trans_lower[c] : tolower_l(c, uselocale(NULL)));
25 42 }
26 43
44 +#undef toupper
27 45 int
28 46 toupper(int c)
29 47 {
30 - return (((unsigned)c > 255) ? c : __trans_upper[c]);
48 + return (isascii(c) ? __trans_upper[c] : toupper_l(c, uselocale(NULL)));
31 49 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX