[hackers] [sbase] Import strsep() from musl libc || sin

From: <git_AT_suckless.org>
Date: Sun, 25 Jan 2015 19:17:21 +0100 (CET)

commit 4b0af0f83396e4b9c10a00d449b31840cd1f852b
Author: sin <sin_AT_2f30.org>
Date: Sun Jan 25 17:48:11 2015 +0000

    Import strsep() from musl libc

diff --git a/Makefile b/Makefile
index c3b9fd7..f1e97e8 100644
--- a/Makefile
+++ b/Makefile
_AT_@ -53,7 +53,8 @@ LIBUTILSRC =\
         libutil/sha512.c\
         libutil/strcasestr.c\
         libutil/strlcat.c\
- libutil/strlcpy.c
+ libutil/strlcpy.c\
+ libutil/strsep.c
 
 LIB = $(LIBUTF) $(LIBUTIL)
 
diff --git a/libutil/strsep.c b/libutil/strsep.c
new file mode 100644
index 0000000..d9f0644
--- /dev/null
+++ b/libutil/strsep.c
_AT_@ -0,0 +1,37 @@
+/*
+ * Copyright 2005-2014 Rich Felker, et al.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+#include <string.h>
+
+#include "../util.h"
+
+char *
+strsep(char **str, const char *sep)
+{
+ char *s = *str, *end;
+ if (!s) return NULL;
+ end = s + strcspn(s, sep);
+ if (*end) *end++ = 0;
+ else end = 0;
+ *str = end;
+ return s;
+}
diff --git a/util.h b/util.h
index 5fc2642..0feedd2 100644
--- a/util.h
+++ b/util.h
_AT_@ -41,6 +41,9 @@ size_t strlcat(char *, const char *, size_t);
 #undef strlcpy
 size_t strlcpy(char *, const char *, size_t);
 
+#undef strsep
+char *strsep(char **, const char *);
+
 /* regex */
 int enregcomp(int, regex_t *, const char *, int);
 int eregcomp(regex_t *, const char *, int);
Received on Sun Jan 25 2015 - 19:17:21 CET