summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2006-04-21 00:04:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:04:12 -0500
commit7970a755ea4b973c752f52232b99ecf09b35d558 (patch)
tree9d0c816bcf7fe5e42747c8676a772cec940667d2
parent1ffb7908d50d11b7423084cdea15628f0dcfe2d7 (diff)
downloadsamba-7970a755ea4b973c752f52232b99ecf09b35d558.tar.gz
samba-7970a755ea4b973c752f52232b99ecf09b35d558.tar.bz2
samba-7970a755ea4b973c752f52232b99ecf09b35d558.zip
r15155: Add strsep replacement from heimdal 0.7.2 for systems that don't
have strsep in libc. (This used to be commit 76dea9f68ca9be909c45979c9e5510133e4f2264)
-rw-r--r--source4/heimdal/lib/roken/strsep.c61
-rw-r--r--source4/heimdal_build/config.mk1
2 files changed, 62 insertions, 0 deletions
diff --git a/source4/heimdal/lib/roken/strsep.c b/source4/heimdal/lib/roken/strsep.c
new file mode 100644
index 0000000000..e34c10fe26
--- /dev/null
+++ b/source4/heimdal/lib/roken/strsep.c
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 1997 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * 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 Institute 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 INSTITUTE 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 INSTITUTE 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+RCSID("$Id: strsep.c,v 1.4 2005/04/12 11:29:10 lha Exp $");
+#endif
+
+#include <string.h>
+
+#include "roken.h"
+
+#ifndef HAVE_STRSEP
+
+char * ROKEN_LIB_FUNCTION
+strsep(char **str, const char *delim)
+{
+ char *save = *str;
+ if(*str == NULL)
+ return NULL;
+ *str = *str + strcspn(*str, delim);
+ if(**str == 0)
+ *str = NULL;
+ else{
+ **str = 0;
+ (*str)++;
+ }
+ return save;
+}
+
+#endif
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 591d15753f..f32c62f6ba 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -333,6 +333,7 @@ OBJ_FILES = \
../heimdal/lib/roken/vis.o \
../heimdal/lib/roken/strlwr.o \
../heimdal/lib/roken/strsep_copy.o \
+ ../heimdal/lib/roken/strsep.o \
../heimdal/lib/roken/strupr.o \
../heimdal/lib/roken/strpool.o \
replace.o