commit fbaf9fba0e646058b4426cab2596000181f92261
from: Omar Polo <op@omarpolo.com>
date: Sun Apr 25 16:49:31 2021 UTC

add compat for strsep

commit - c6d03cf5d51c4d8b5d9ed43883f520f1e575733c
commit + fbaf9fba0e646058b4426cab2596000181f92261
blob - /dev/null
blob + f356bd3596c7be42b87053d5577871988bb32921 (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 <string.h>
+
+#include "compat.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 - 1ad95c858c9b6e4f24d0d76e3772b2b7e49d5cae
blob + 804d271dfd33fc7371e6312e838546d6490dfaec
--- compat.h
+++ compat.h
@@ -86,6 +86,10 @@ size_t		 strlcpy(char*, const char*, size_t);
 size_t		 strlcat(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 - 3b95efdd039b997501c92409b1094bbab4cba978
blob + af6665661ccb249ba389205c3b95412ca701745d
--- configure.ac
+++ configure.ac
@@ -17,6 +17,7 @@ AC_REPLACE_FUNCS([
 	recallocarray \
 	strlcat \
 	strlcpy \
+	strsep \
 	strtonum \
 	setproctitle \
 ])