svn commit: samba r15155 - in branches/SAMBA_4_0/source: heimdal/lib/roken heimdal_build

jpeach at samba.org jpeach at samba.org
Fri Apr 21 00:04:36 GMT 2006


Author: jpeach
Date: 2006-04-21 00:04:21 +0000 (Fri, 21 Apr 2006)
New Revision: 15155

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15155

Log:
Add strsep replacement from heimdal 0.7.2 for systems that don't
have strsep in libc.

Added:
   branches/SAMBA_4_0/source/heimdal/lib/roken/strsep.c
Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.mk


Changeset:
Added: branches/SAMBA_4_0/source/heimdal/lib/roken/strsep.c
===================================================================
--- branches/SAMBA_4_0/source/heimdal/lib/roken/strsep.c	2006-04-20 22:15:17 UTC (rev 15154)
+++ branches/SAMBA_4_0/source/heimdal/lib/roken/strsep.c	2006-04-21 00:04:21 UTC (rev 15155)
@@ -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

Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.mk	2006-04-20 22:15:17 UTC (rev 15154)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk	2006-04-21 00:04:21 UTC (rev 15155)
@@ -333,6 +333,7 @@
 	../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



More information about the samba-cvs mailing list