From 08336907db2b2e36ed521a5202d89d6decdee1fb Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Mon, 29 Jun 2015 11:14:49 -0400
Subject: [PATCH] netresolv: Get rid of BSD strsep compat code.

We already have this in our libbsd.
---
 src/kits/network/netresolv/Jamfile      |  6 +-
 src/kits/network/netresolv/bsd/strsep.c | 88 -------------------------
 2 files changed, 1 insertion(+), 93 deletions(-)
 delete mode 100644 src/kits/network/netresolv/bsd/strsep.c

diff --git a/src/kits/network/netresolv/Jamfile b/src/kits/network/netresolv/Jamfile
index adcbfdf1ad..cca6418946 100644
--- a/src/kits/network/netresolv/Jamfile
+++ b/src/kits/network/netresolv/Jamfile
@@ -14,8 +14,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 		# private sources for this port
 		SEARCH_SOURCE += [ FDirName $(SUBDIR) src ] ;
 
-		# BIND sources
-		SEARCH_SOURCE += [ FDirName $(SUBDIR) bsd ] ;
+		# NetResolv sources
 		SEARCH_SOURCE += [ FDirName $(SUBDIR) dst ] ;
 		SEARCH_SOURCE += [ FDirName $(SUBDIR) inet ] ;
 		SEARCH_SOURCE += [ FDirName $(SUBDIR) irs ] ;
@@ -120,9 +119,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			res_query.c
 			res_send.c
 			res_state.c
-
-			# private functions
-			strsep.c
 			;
 	}
 }
diff --git a/src/kits/network/netresolv/bsd/strsep.c b/src/kits/network/netresolv/bsd/strsep.c
deleted file mode 100644
index c7969f0028..0000000000
--- a/src/kits/network/netresolv/bsd/strsep.c
+++ /dev/null
@@ -1,88 +0,0 @@
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "strsep.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: strsep.c,v 1.2 2005/04/27 04:56:12 sra Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. 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 "port_before.h"
-#include <sys/cdefs.h>
-#include <string.h>
-#include <stdio.h>
-#include "port_after.h"
-
-#ifndef NEED_STRSEP
-int __strsep_unneeded__;
-#else
-
-/*%
- * 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 */
-}
-
-#endif /*NEED_STRSEP*/
-
-/*! \file */