From 2e46a6ce8cf3aa1da8c02c802313e773b34aee1e Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Mon, 16 Sep 2013 00:20:30 +0200 Subject: [PATCH] Add wcspbrk(3). --- libc/Makefile | 1 + libc/include/wchar.h | 2 +- libc/wchar/wcspbrk.cpp | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 libc/wchar/wcspbrk.cpp diff --git a/libc/Makefile b/libc/Makefile index e1946cba..ba50ab99 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -188,6 +188,7 @@ wchar/wcslen.o \ wchar/wcsncat.o \ wchar/wcsncmp.o \ wchar/wcsncpy.o \ +wchar/wcspbrk.o \ wchar/wcsrchr.o \ wchar/wcsrtombs.o \ wchar/wcsspn.o \ diff --git a/libc/include/wchar.h b/libc/include/wchar.h index cd1e9e45..5d8fd8a1 100644 --- a/libc/include/wchar.h +++ b/libc/include/wchar.h @@ -76,6 +76,7 @@ size_t wcslen(const wchar_t*); wchar_t* wcsncat(wchar_t* __restrict, const wchar_t* __restrict, size_t); int wcsncmp(const wchar_t*, const wchar_t*, size_t); wchar_t* wcsncpy(wchar_t* __restrict, const wchar_t* __restrict, size_t); +wchar_t* wcspbrk(const wchar_t*, const wchar_t*); wchar_t* wcsrchr(const wchar_t*, wchar_t); size_t wcsrtombs(char* __restrict, const wchar_t** __restrict, size_t, mbstate_t* __restrict); size_t wcsspn(const wchar_t*, const wchar_t*); @@ -113,7 +114,6 @@ int wscanf(const wchar_t* __restrict, ...); long double wcstold(const wchar_t* __restrict, wchar_t** __restrict); size_t wcsftime(wchar_t* __restrict, size_t, const wchar_t* __restrict, const struct tm* __restrict); wchar_t* fgetws(wchar_t* __restrict, int, FILE* __restrict); -wchar_t* wcspbrk(const wchar_t*, const wchar_t*); wchar_t* wcsstr(const wchar_t* __restrict, const wchar_t* __restrict); wchar_t* wcswcs(const wchar_t*, const wchar_t*); wchar_t* wmemchr(const wchar_t*, wchar_t, size_t); diff --git a/libc/wchar/wcspbrk.cpp b/libc/wchar/wcspbrk.cpp new file mode 100644 index 00000000..89ae3b3c --- /dev/null +++ b/libc/wchar/wcspbrk.cpp @@ -0,0 +1,33 @@ +/******************************************************************************* + + Copyright(C) Jonas 'Sortie' Termansen 2013. + + This file is part of the Sortix C Library. + + The Sortix C Library is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation, either version 3 of the License, or (at your + option) any later version. + + The Sortix C Library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with the Sortix C Library. If not, see . + + wchar/wcspbrk.cpp + Search a wide string for any of a set of wide characters. + +*******************************************************************************/ + +#include + +extern "C" wchar_t* wcspbrk(const wchar_t* str, const wchar_t* accept) +{ + size_t rejectlen = wcscspn(str, accept); + if ( !str[rejectlen] ) + return NULL; + return (wchar_t*) str + rejectlen; +}