Skip to content

Commit d386df4

Browse files
extinguishxiaoxiang781216
authored andcommitted
libs/libc/wchar: add wcswidth implementation
Signed-off-by: guoshichao <[email protected]>
1 parent 7c0685c commit d386df4

File tree

3 files changed

+65
-2
lines changed

3 files changed

+65
-2
lines changed

libs/libc/wchar/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,5 @@ target_sources(
6363
lib_wcsstr.c
6464
lib_wcstok.c
6565
lib_wcswcs.c
66-
lib_wcwidth.c)
66+
lib_wcwidth.c
67+
lib_wcswidth.c)

libs/libc/wchar/Make.defs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ CSRCS += lib_swprintf.c lib_mbsnrtowcs.c lib_wcsnrtombs.c lib_mbsinit.c
2929
CSRCS += lib_mbrlen.c lib_mbsrtowcs.c lib_wcsrtombs.c lib_wcscpy.c
3030
CSRCS += lib_wcscat.c lib_wcslcat.c lib_wcsncat.c lib_wcsrchr.c lib_wcschr.c
3131
CSRCS += lib_wcsncpy.c lib_wcsncmp.c lib_wcscspn.c lib_wcspbrk.c lib_wcsspn.c
32-
CSRCS += lib_wcsstr.c lib_wcstok.c lib_wcswcs.c lib_wcwidth.c
32+
CSRCS += lib_wcsstr.c lib_wcstok.c lib_wcswcs.c lib_wcwidth.c lib_wcswidth.c
3333

3434
# Add the wchar directory to the build
3535

libs/libc/wchar/lib_wcswidth.c

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
/****************************************************************************
2+
* libs/libc/wchar/lib_wcswidth.c
3+
*
4+
* Copyright © 2005-2014 Rich Felker, et al.
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining
7+
* a copy of this software and associated documentation files (the
8+
* "Software"), to deal in the Software without restriction, including
9+
* without limitation the rights to use, copy, modify, merge, publish,
10+
* distribute, sublicense, and/or sell copies of the Software, and to
11+
* permit persons to whom the Software is furnished to do so, subject to
12+
* the following conditions:
13+
*
14+
* The above copyright notice and this permission notice shall be
15+
* included in all copies or substantial portions of the Software.
16+
*
17+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
18+
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
19+
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
20+
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
21+
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
22+
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
23+
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
24+
*
25+
****************************************************************************/
26+
27+
/****************************************************************************
28+
* Included Files
29+
****************************************************************************/
30+
31+
#include <wchar.h>
32+
33+
/****************************************************************************
34+
* Public Functions
35+
****************************************************************************/
36+
37+
/****************************************************************************
38+
* Name: wcswidth
39+
*
40+
* Description:
41+
* Determine columns needed for a fixed-size wide charcater string
42+
*
43+
* Input Parameters:
44+
* wcs - the wide character string need to calculate
45+
* n - the length the wide character string
46+
*
47+
* Returned Value:
48+
* Return the number of columns needed to represent the wide-character
49+
* string pointed by "wcs", but at most "n" wide character. If a
50+
* nonprintable wide character occurs among these characters, -1 is
51+
* returned
52+
*
53+
****************************************************************************/
54+
55+
int wcswidth(FAR const wchar_t *wcs, size_t n)
56+
{
57+
int l = 0;
58+
int k = 0;
59+
for (; n-- && *wcs && (k = wcwidth(*wcs)) >= 0; l += k, wcs++);
60+
61+
return k < 0 ? k : l;
62+
}

0 commit comments

Comments
 (0)