14687 need in-kernel strtok_r()

Reviewed by: Robert Mustacchi <rm+illumos@fingolfin.org>
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Yuri Pankov <ypankov@tintri.com>
Reviewed by: Andy Fiddaman <andy@omnios.org>
Approved by: Dan McDonald <danmcd@mnx.io>

1 files changed, 35 insertions, 1 deletions

diff --git a/usr/src/common/util/string.c b/usr/src/common/util/string.c
index 8e1247f381..c44dc4b402 100644
--- a/usr/src/common/util/string.c
+++ b/usr/src/common/util/string.c
@@ -26,7 +26,7 @@
 
 /*
  * Copyright (c) 2016 by Delphix. All rights reserved.
- * Copyright 2018 Nexenta Systems, Inc.
+ * Copyright 2022 Tintri by DDN, Inc. All rights reserved.
  */
 
 /*
@@ -709,6 +709,40 @@ strsep(char **stringp, const char *delim)
 }
 
 /*
+ * strtok_r
+ *
+ * uses strpbrk and strspn to break string into tokens on
+ * sequentially subsequent calls.  returns NULL when no
+ * non-separator characters remain.
+ * `subsequent' calls are calls with first argument NULL.
+ */
+char *
+strtok_r(char *string, const char *sepset, char **lasts)
+{
+	char	*q, *r;
+
+	/* first or subsequent call */
+	if (string == NULL)
+		string = *lasts;
+
+	if (string == NULL)		/* return if no tokens remaining */
+		return (NULL);
+
+	q = string + strspn(string, sepset);	/* skip leading separators */
+
+	if (*q == '\0')		/* return if no tokens remaining */
+		return (NULL);
+
+	if ((r = strpbrk(q, sepset)) == NULL) {	/* move past token */
+		*lasts = NULL;	/* indicate this is last token */
+	} else {
+		*r = '\0';
+		*lasts = r + 1;
+	}
+	return (q);
+}
+
+/*
  * Unless mentioned otherwise, all of the routines below should be added to
  * the Solaris DDI as necessary.  For now, only provide them to standalone.
  */