diff --git a/src/header/wchar/mod.rs b/src/header/wchar/mod.rs index 9d1d245d2b05e1d16d69f963cc393ec4882c7c9d..19d8fbea62066369724494f4af6abf9a07961519 100644 --- a/src/header/wchar/mod.rs +++ b/src/header/wchar/mod.rs @@ -295,7 +295,7 @@ pub unsafe extern "C" fn wcscat(ws1: *mut wchar_t, ws2: *const wchar_t) -> *mut } #[no_mangle] -pub unsafe extern "C" fn wcschr(ws: *const wchar_t, wc: wchar_t) -> *mut c_int { +pub unsafe extern "C" fn wcschr(ws: *const wchar_t, wc: wchar_t) -> *mut wchar_t { let mut i = 0; loop { if *ws.add(i) == wc { @@ -331,9 +331,18 @@ pub unsafe extern "C" fn wcscpy(ws1: *mut wchar_t, ws2: *const wchar_t) -> *mut } } -// #[no_mangle] -pub extern "C" fn wcscspn(ws1: *const wchar_t, ws2: *const wchar_t) -> size_t { - unimplemented!(); +#[no_mangle] +pub unsafe extern "C" fn wcscspn(ws1: *const wchar_t, ws2: *const wchar_t) -> size_t { + let mut i = 0; + loop { + let wc = *ws1.add(i); + + if wc == 0 || wcschr(ws2, wc) != 0 as *mut wchar_t { + return i; + } + + i += 1; + } } // #[no_mangle] diff --git a/tests/Makefile b/tests/Makefile index 30efeddaeca20c4250866f61a7d37ab6115f8b96..0ae8aa78680963d41af4aff816f3485a8d64c82d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -86,7 +86,8 @@ EXPECT_BINS=\ wchar/mbrtowc \ wchar/mbsrtowcs \ wchar/putwchar \ - wchar/wcrtomb + wchar/wcrtomb \ + wchar/wcscspn # Binaries that may generate varied output BINS=\ diff --git a/tests/expected/wchar/wcscspn.stderr b/tests/expected/wchar/wcscspn.stderr new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/tests/expected/wchar/wcscspn.stdout b/tests/expected/wchar/wcscspn.stdout new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/tests/wchar/wcscspn.c b/tests/wchar/wcscspn.c new file mode 100644 index 0000000000000000000000000000000000000000..f61adae236ab5b79bafdff9486745f9417f03ab7 --- /dev/null +++ b/tests/wchar/wcscspn.c @@ -0,0 +1,16 @@ +#include <assert.h> +#include <wchar.h> + +int main(void) { + + assert(wcscspn(L"", L"") == 0); + assert(wcscspn(L"", L"h") == 0); + assert(wcscspn(L"a", L"a") == 0); + + assert(wcscspn(L"ba", L"ab") == 0); + assert(wcscspn(L"ba", L"a") == 1); + + assert(wcscspn(L"abcdefghijkl$\"£$%", L"zxqrst,./$w") == 12); + + return 0; +}