diff --git a/libc/Makefile b/libc/Makefile
index 82f6eb0c..e8b7db71 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -131,6 +131,8 @@ vfscanf.o \
vsscanf.o \
wcrtomb.o \
wcscat.o \
+wcschrnul.o \
+wcschr.o \
wcscpy.o \
wcslen.o \
wctomb.o \
diff --git a/libc/include/wchar.h b/libc/include/wchar.h
index 311899cf..faa6262b 100644
--- a/libc/include/wchar.h
+++ b/libc/include/wchar.h
@@ -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*);
diff --git a/libc/wcschr.cpp b/libc/wcschr.cpp
new file mode 100644
index 00000000..58a6f933
--- /dev/null
+++ b/libc/wcschr.cpp
@@ -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 .
+
+ wcschr.cpp
+ Searches a string for a specific character.
+
+*******************************************************************************/
+
+#include
+
+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;
+}
diff --git a/libc/wcschrnul.cpp b/libc/wcschrnul.cpp
new file mode 100644
index 00000000..1aa34ec4
--- /dev/null
+++ b/libc/wcschrnul.cpp
@@ -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 .
+
+ wcschrnul.cpp
+ Searches a string for a specific character.
+
+*******************************************************************************/
+
+#include
+
+extern "C" wchar_t* wcschrnul(const wchar_t* str, wchar_t c)
+{
+ for ( ; *str != c; str++ )
+ if ( !*str )
+ return NULL;
+ return (wchar_t*) str;
+}