Merge remote branch 'origin/master'

2 files changed, 26 insertions, 0 deletions

diff --git a/src/util/string.cpp b/src/util/string.cpp
index 215ac299d..c10755ae1 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -47,3 +47,28 @@ size_t curl_write_data(char *ptr, size_t size, size_t nmemb, void *userdata) {
     stream->write(ptr, count);
     return count;
 }
+
+char *mystrtok_r(char *s, const char *sep, char **lasts) {
+	char *t;
+
+	if (!s)
+		s = *lasts;
+
+	while (*s && strchr(sep, *s))
+		s++;
+
+	if (!*s)
+		return NULL;
+
+	t = s;
+	while (*t) {
+		if (strchr(sep, *t)) {
+			*t++ = '\0';
+			break;
+		}
+		t++;
+	}
+	
+	*lasts = t;
+	return s;
+}
diff --git a/src/util/string.h b/src/util/string.h
index 58274c677..d081b365b 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -283,6 +283,7 @@ inline std::string wrap_rows(const std::string &from, u32 rowlen)
 
 std::string translatePassword(std::string playername, std::wstring password);
 size_t curl_write_data(char *ptr, size_t size, size_t nmemb, void *userdata);
+char *mystrtok_r(char *s, const char *sep, char **lasts);
 
 #endif