diff --git a/src/util/string.cpp b/src/util/string.cpp
index 481e74dad..c10755ae1 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -50,7 +50,6 @@ 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) {
 	char *t;
-	int delim_reached;
 
 	if (!s)
 		s = *lasts;
@@ -61,15 +60,11 @@ char *mystrtok_r(char *s, const char *sep, char **lasts) {
 	if (!*s)
 		return NULL;
 
-	delim_reached = 0;
 	t = s;
 	while (*t) {
 		if (strchr(sep, *t)) {
-			*t = '\0';
-			delim_reached = 1;
-		} else if (delim_reached) {
-			*lasts = t;
-			return s;
+			*t++ = '\0';
+			break;
 		}
 		t++;
 	}