diff --git a/libc/Makefile b/libc/Makefile
index 488f460b..e41fff60 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -199,6 +199,7 @@ wchar/wcstol.o \
wchar/wcstoull.o \
wchar/wcstoul.o \
wchar/wcsxfrm.o \
+wchar/wmemchr.o \
wchar/wmemcmp.o \
wctype/wctype.o \
diff --git a/libc/include/wchar.h b/libc/include/wchar.h
index 2f2ac21b..feae8546 100644
--- a/libc/include/wchar.h
+++ b/libc/include/wchar.h
@@ -87,6 +87,7 @@ long wcstol(const wchar_t* __restrict, wchar_t** __restrict, int);
unsigned long long wcstoull(const wchar_t* __restrict, wchar_t** __restrict, int);
unsigned long wcstoul(const wchar_t* __restrict, wchar_t** __restrict, int);
size_t wcsxfrm(wchar_t* __restrict, const wchar_t* __restrict, size_t);
+wchar_t* wmemchr(const wchar_t*, wchar_t, size_t);
int wmemcmp(const wchar_t*, const wchar_t*, size_t);
/* TODO: These are not implemented in sortix libc yet. */
@@ -115,7 +116,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* wmemchr(const wchar_t*, wchar_t, size_t);
wchar_t* wmemcpy(wchar_t* __restrict, const wchar_t* __restrict, size_t);
wchar_t* wmemmove(wchar_t*, const wchar_t*, size_t);
wchar_t* wmemset(wchar_t*, wchar_t, size_t);
diff --git a/libc/wchar/wmemchr.cpp b/libc/wchar/wmemchr.cpp
new file mode 100644
index 00000000..93ebef86
--- /dev/null
+++ b/libc/wchar/wmemchr.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/wmemchr.cpp
+ Scans memory for a wide character.
+
+*******************************************************************************/
+
+#include
+
+extern "C" wchar_t* wmemchr(const wchar_t* s, wchar_t c, size_t n)
+{
+ for ( size_t i = 0; i < n; i++ )
+ if ( s[i] == c )
+ return (wchar_t*) s + i;
+ return NULL;
+}