commit 15974c9d1ff2f517a2252625b52b74f4ab294667
from: Omar Polo <op@omarpolo.com>
date: Wed Jul 28 21:14:57 2021 UTC

add compat for strsep

commit - aeb5a5786f903c4fddf353eb40e5803518ac88dd
commit + 15974c9d1ff2f517a2252625b52b74f4ab294667
blob - /dev/null
blob + ea71d7bba91e7b03ad3b9049d129e90752f3c457 (mode 644)
--- /dev/null
+++ compat/strsep.c
@@ -0,0 +1,72 @@
+/*	$OpenBSD: strsep.c,v 1.8 2015/08/31 02:53:57 guenther Exp $	*/
+
+/*-
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "compat.h"
+
+#include <string.h>
+
+/*
+ * Get next token from string *stringp, where tokens are possibly-empty
+ * strings separated by characters from delim.  
+ *
+ * Writes NULs into the string at *stringp to end tokens.
+ * delim need not remain constant from call to call.
+ * On return, *stringp points past the last NUL written (if there might
+ * be further tokens), or is NULL (if there are definitely no more tokens).
+ *
+ * If *stringp is NULL, strsep returns NULL.
+ */
+char *
+strsep(char **stringp, const char *delim)
+{
+	char *s;
+	const char *spanp;
+	int c, sc;
+	char *tok;
+
+	if ((s = *stringp) == NULL)
+		return (NULL);
+	for (tok = s;;) {
+		c = *s++;
+		spanp = delim;
+		do {
+			if ((sc = *spanp++) == c) {
+				if (c == 0)
+					s = NULL;
+				else
+					s[-1] = 0;
+				*stringp = s;
+				return (tok);
+			}
+		} while (sc != 0);
+	}
+	/* NOTREACHED */
+}
blob - 8b46405bbe928128fe3e95ea0f4d4b1bf4062e79
blob + 9a68754d4d209914e3417929ce828d8fae9025b1
--- compat.h
+++ compat.h
@@ -118,6 +118,10 @@ size_t		 strlcat(char *, const char *, size_t);
 size_t		 strlcpy(char *, const char *, size_t);
 #endif
 
+#ifndef HAVE_STRSEP
+char		*strsep(char **, const char *);
+#endif
+
 #ifndef HAVE_STRTONUM
 long long	 strtonum(const char *, long long, long long, const char **);
 #endif
blob - 36e3015aa62479385c3db94cfae227eee4695fae
blob + 4f727eabb27dd7522f89937e821df3a768846de1
--- configure.ac
+++ configure.ac
@@ -61,6 +61,7 @@ AC_REPLACE_FUNCS([
 	setprogname	\
 	strlcat		\
 	strlcpy		\
+	strsep		\
 	strtonum	\
 ])