nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add wcschr{,nul}(3).

This commit is contained in:
Jonas 'Sortie' Termansen 2013-03-24 00:37:22 +01:00
parent 10d01d8098
commit ff33adeb7f
4 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/Makefile
View File

@ -131,6 +131,8 @@ vfscanf.o \
vsscanf.o \
wcrtomb.o \
wcscat.o \
wcschrnul.o \
wcschr.o \
wcscpy.o \
wcslen.o \
wctomb.o \

3
libc/include/wchar.h
View File

@ -64,6 +64,8 @@ struct tm;
size_t wcrtomb(char* restrict, wchar_t, mbstate_t* restrict);
size_t mbrtowc(wchar_t* restrict, const char* restrict, size_t, mbstate_t* restrict);
wchar_t* wcscat(wchar_t* restrict, const wchar_t* restrict);
wchar_t* wcschr(const wchar_t*, wchar_t);
wchar_t* wcschrnul(const wchar_t*, wchar_t);
wchar_t* wcscpy(wchar_t* restrict, const wchar_t* restrict);
size_t wcslen(const wchar_t*);
@ -107,7 +109,6 @@ size_t wcsxfrm(wchar_t* restrict, const wchar_t* restrict, size_t);
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* wcschr(const wchar_t*, 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* wcspbrk(const wchar_t*, const wchar_t*);

31
libc/wcschr.cpp Normal file
View File

@ -0,0 +1,31 @@
/*******************************************************************************
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 <http://www.gnu.org/licenses/>.
wcschr.cpp
Searches a string for a specific character.
*******************************************************************************/
#include <wchar.h>
extern "C" wchar_t* wcschr(const wchar_t* str, wchar_t c)
{
wchar_t* ret = wcschrnul(str, c);
return ret && c == ret[0] ? ret : NULL;
}

33
libc/wcschrnul.cpp Normal file
View File

@ -0,0 +1,33 @@
/*******************************************************************************
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 <http://www.gnu.org/licenses/>.
wcschrnul.cpp
Searches a string for a specific character.
*******************************************************************************/
#include <wchar.h>
extern "C" wchar_t* wcschrnul(const wchar_t* str, wchar_t c)
{
for ( ; *str != c; str++ )
if ( !*str )
return NULL;
return (wchar_t*) str;
}