From eb9e027697cc14688736cd9c36af98485654f864 Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Sun, 24 Mar 2013 00:50:57 +0100
Subject: [PATCH] Add wcstok(3).

---
 libc/Makefile        |  1 +
 libc/include/wchar.h |  2 +-
 libc/wcstok.cpp      | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 libc/wcstok.cpp

diff --git a/libc/Makefile b/libc/Makefile
index d8adb659..92d06d9d 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -141,6 +141,7 @@ wcsncat.o \
 wcsncpy.o \
 wcsrchr.o \
 wcsspn.o \
+wcstok.o \
 wctomb.o \
 wctype.o \
 
diff --git a/libc/include/wchar.h b/libc/include/wchar.h
index 5c8e206c..bad8a152 100644
--- a/libc/include/wchar.h
+++ b/libc/include/wchar.h
@@ -74,6 +74,7 @@ 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);
 size_t wcsspn(const wchar_t*, const wchar_t*);
+wchar_t* wcstok(wchar_t* restrict, const wchar_t* restrict, wchar_t** restrict);
 
 /* TODO: These are not implemented in sortix libc yet. */
 #if defined(__SORTIX_SHOW_UNIMPLEMENTED)
@@ -114,7 +115,6 @@ 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* 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*);
 wchar_t* wmemchr(const wchar_t*, wchar_t, size_t);
 wchar_t* wmemcpy(wchar_t* restrict, const wchar_t* restrict, size_t);
diff --git a/libc/wcstok.cpp b/libc/wcstok.cpp
new file mode 100644
index 00000000..ac8c19f5
--- /dev/null
+++ b/libc/wcstok.cpp
@@ -0,0 +1,43 @@
+/*******************************************************************************
+
+    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/>.
+
+    wcstok.cpp
+    Extract tokens from strings.
+
+*******************************************************************************/
+
+#include <wchar.h>
+
+extern "C" wchar_t* wcstok(wchar_t* str, const wchar_t* delim, wchar_t** saveptr)
+{
+	if ( !str && !*saveptr )
+		return NULL;
+	if ( !str )
+		str = *saveptr;
+	str += wcsspn(str, delim); // Skip leading
+	if ( !*str )
+		return *saveptr = NULL;
+	size_t amount = wcscspn(str, delim);
+	if ( str[amount] )
+		*saveptr = str + amount + 1;
+	else
+		*saveptr = NULL;
+	str[amount] = L'\0';
+	return str;
+}