From: Gurucharan Shetty <gshetty@nicira.com>
Date: Thu, 13 Mar 2014 22:20:15 +0000 (-0700)
Subject: strsep: Copy from netbsd.
X-Git-Tag: sliver-openvswitch-2.2.90-1~6^2~94
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=f062911fe35374744a8753700a6fb5776bc3ef92

strsep: Copy from netbsd.

Windows does not have a strsep.

Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/COPYING b/COPYING
index 2003830c5..9d6fc48e0 100644
--- a/COPYING
+++ b/COPYING
@@ -29,6 +29,7 @@ The following files are licensed under the 2-clause BSD license.
 The following files are licensed under the 3-clause BSD-license
     include/windows/netinet/icmp6.h
     include/windows/netinet/ip6.h
+    lib/strsep.c
 
 Files under the xenserver directory are licensed on a file-by-file
 basis.  Refer to each file for details.
diff --git a/debian/copyright.in b/debian/copyright.in
index a625b18a8..89cd2d216 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -16,7 +16,7 @@ Upstream Copyright Holders:
 	Copyright (C) 2000-2003 Geoffrey Wossum (gwossum@acm.org)
 	Copyright (C) 2000 The NetBSD Foundation, Inc.
 	Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
-	Copyright (c) 1982, 1986, 1993 The Regents of the University of California.
+	Copyright (c) 1982, 1986, 1990, 1993 The Regents of the University of California.
 
 License:
 
@@ -90,6 +90,7 @@ License:
 
 	include/windows/netinet/icmp6.h
 	include/windows/netinet/ip6.h
+	lib/strsep.c
 
 * The following components are dual-licensed under the
   GNU General Public License version 2 and the Apache License Version 2.0.
diff --git a/include/windows/windefs.h b/include/windows/windefs.h
index ca5b6136d..6f173b38d 100644
--- a/include/windows/windefs.h
+++ b/include/windows/windefs.h
@@ -37,4 +37,6 @@
 
 typedef int pid_t;
 
+char *strsep(char **stringp, const char *delim);
+
 #endif /* windefs.h */
diff --git a/lib/automake.mk b/lib/automake.mk
index e3192fcb9..e22165ca3 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -244,6 +244,7 @@ lib_libopenvswitch_la_SOURCES += \
 	lib/getrusage-windows.c \
 	lib/latch-windows.c \
 	lib/route-table-stub.c \
+	lib/strsep.c \
 	lib/stream-fd-windows.c
 else
 lib_libopenvswitch_la_SOURCES += \
diff --git a/lib/strsep.c b/lib/strsep.c
new file mode 100644
index 000000000..3ec7a2626
--- /dev/null
+++ b/lib/strsep.c
@@ -0,0 +1,73 @@
+/*-
+ * 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 <config.h>
+#include "util.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.
+ */
+#define _DIAGASSERT(q) ovs_assert(q)
+char *
+strsep(char **stringp, const char *delim)
+{
+	char *s;
+	const char *spanp;
+	int c, sc;
+	char *tok;
+
+	_DIAGASSERT(stringp != NULL);
+	_DIAGASSERT(delim != NULL);
+
+	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 */
+}