From: Simon Wilkinson <sxw@your-file-system.com>
Date: Tue, 23 Nov 2010 11:31:27 +0000 (+0000)
Subject: roken: Add the strsep function
X-Git-Tag: upstream/1.8.0_pre1^2~4469
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7c4ee52c1a70838284c1354c654233fa20a341f3;p=packages%2Fo%2Fopenafs.git

roken: Add the strsep function

Add the strsep function (as rk_strsep) to the OpenAFS roken build.
This function is required by Windows, and is now checked for on Unix.

Change-Id: I71d8e11a30c34aaa89d85d1e6e527d594d5734af
Reviewed-on: http://gerrit.openafs.org/3371
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
---

diff --git a/acinclude.m4 b/acinclude.m4
index 7faeb65cb..77c3caa58 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1331,6 +1331,7 @@ AC_REPLACE_FUNCS([ \
 	strlcat \
 	strnlen \
 	strlcpy \
+	strsep \
 	verr \
 	verrx \
 	vsyslog \
diff --git a/src/roken/Makefile.in b/src/roken/Makefile.in
index 7c22a31ed..86788dba3 100644
--- a/src/roken/Makefile.in
+++ b/src/roken/Makefile.in
@@ -135,6 +135,9 @@ strlcpy.o: ${UPSTREAM}/strlcpy.c
 strnlen.o: ${UPSTREAM}/strnlen.c
 	$(AFS_CCRULE) $(UPSTREAM)/strnlen.c
 
+strsep.o: ${UPSTREAM}/strsep.c
+	$(AFS_CCRULE) $(UPSTREAM)/strsep.c
+
 verr.o: ${UPSTREAM}/verr.c err.h
 	$(AFS_CCRULE) $(UPSTREAM)/verr.c
 
diff --git a/src/roken/NTMakefile b/src/roken/NTMakefile
index 5886b795f..6fa465105 100644
--- a/src/roken/NTMakefile
+++ b/src/roken/NTMakefile
@@ -45,6 +45,7 @@ ROKEN_OBJS = \
 	$(OUT)\strlcat.obj \
 	$(OUT)\strlcpy.obj \
 	$(OUT)\strnlen.obj \
+	$(OUT)\strsep.obj \
         $(OUT)\verr.obj \
         $(OUT)\verrx.obj \
         $(OUT)\vwarn.obj \
diff --git a/src/roken/afsroken.def b/src/roken/afsroken.def
index 4b000ea1b..04377db77 100644
--- a/src/roken/afsroken.def
+++ b/src/roken/afsroken.def
@@ -26,3 +26,4 @@ EXPORTS
 	warnx			@30
 	base64_decode		@31
 	base64_encode		@32
+	rk_strsep		@33
diff --git a/src/roken/librokenafs.map b/src/roken/librokenafs.map
index 340529ec5..d5a5704ab 100644
--- a/src/roken/librokenafs.map
+++ b/src/roken/librokenafs.map
@@ -23,6 +23,7 @@
 		rk_strlcat;
 		rk_strnlen;
 		rk_strlcpy;
+		rk_strsep;
 		strcasecmp;
 		verr;
 		verrx;