patch-2.3.9 linux/lib/string.c

• Lines: 37
• Date: Fri Jun 25 14:35:42 1999
• Orig file: v2.3.8/linux/lib/string.c
• Orig date: Sun Sep 6 11:19:15 1998

diff -u --recursive --new-file v2.3.8/linux/lib/string.c linux/lib/string.c
@@ -9,6 +9,10 @@
  * as inline code in <asm-xx/string.h>
  *
  * These are buggy as well..
+ *
+ * * Fri Jun 25 1999, Ingo Oeser <ioe@informatik.tu-chemnitz.de>
+ * -  Added strsep() which will replace strtok() soon (because strsep() is
+ *    reentrant and should be faster). Use only strsep() in new code, please.
  */
  
 #include <linux/types.h>
@@ -228,6 +232,25 @@
 	if (send && *send != '\0')
 		*send++ = '\0';
 	___strtok = send;
+	return (sbegin);
+}
+#endif
+
+#ifndef __HAVE_ARCH_STRSEP
+
+char * strsep(char **s, const char * ct)
+{
+	char *sbegin=*s;
+	if (!sbegin) 
+		return NULL;
+	
+	sbegin += strspn(sbegin,ct);
+	if (*sbegin == '\0') 
+		return NULL;
+	
+	*s = strpbrk( sbegin, ct);
+	if (*s && **s != '\0')
+		**s++ = '\0';
 	return (sbegin);
 }
 #endif