diff --git a/libc/Makefile b/libc/Makefile index 3ebaccbf..3ae67cd5 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -138,6 +138,7 @@ wcscpy.o \ wcslen.o \ wcsncat.o \ wcsncpy.o \ +wcsrchr.o \ wctomb.o \ wctype.o \ diff --git a/libc/include/wchar.h b/libc/include/wchar.h index 8921cc11..1e241a49 100644 --- a/libc/include/wchar.h +++ b/libc/include/wchar.h @@ -71,6 +71,7 @@ wchar_t* wcscpy(wchar_t* restrict, const wchar_t* restrict); size_t wcslen(const wchar_t*); wchar_t* wcsncat(wchar_t* restrict, const wchar_t* restrict, size_t); wchar_t* wcsncpy(wchar_t* restrict, const wchar_t* restrict, size_t); +wchar_t* wcsrchr(const wchar_t*, wchar_t); /* TODO: These are not implemented in sortix libc yet. */ #if defined(__SORTIX_SHOW_UNIMPLEMENTED) @@ -112,7 +113,6 @@ unsigned long long wcstoull(const wchar_t* restrict, wchar_t** restrict, int); unsigned long wcstoul(const wchar_t* restrict, wchar_t** restrict, int); wchar_t* fgetws(wchar_t* restrict, int, FILE* restrict); wchar_t* wcspbrk(const wchar_t*, const wchar_t*); -wchar_t* wcsrchr(const wchar_t*, wchar_t); wchar_t* wcsstr(const wchar_t* restrict, const wchar_t* restrict); wchar_t* wcstok(wchar_t* restrict, const wchar_t* restrict, wchar_t** restrict); wchar_t* wcswcs(const wchar_t*, const wchar_t*); diff --git a/libc/wcsrchr.cpp b/libc/wcsrchr.cpp new file mode 100644 index 00000000..3e3c5f39 --- /dev/null +++ b/libc/wcsrchr.cpp @@ -0,0 +1,37 @@ +/******************************************************************************* + + Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 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 . + + wcsrchr.cpp + Searches a string for a specific character. + +*******************************************************************************/ + +#include + +extern "C" wchar_t* wcsrchr(const wchar_t* str, wchar_t c) +{ + const wchar_t* last = NULL; + while ( *str ) + { + if ( *str == c ) + last = str; + str++; + } + return (wchar_t*) last; +}