added strsep

Author: ZERICO2005

src/libc/include/string.h

@@ -86,6 +86,9 @@ char *strcasestr(const char *haystack, const char *needle)
 char *strtok(char *__restrict s, const char *__restrict delim)
     __attribute__((nonnull(2)));
 
+char *strsep(char **__restrict s, const char *__restrict delim)
+    __NOEXCEPT __attribute__((nonnull(1, 2)));
+
 char *strdup(const char *s)
     __attribute__((__malloc__)) __attribute__((nonnull(1)));
 

src/libc/strsep.src

@@ -0,0 +1,46 @@
+	assume	adl=1
+
+	section	.text
+
+	public	_strsep
+
+; char *strsep(char **__restrict stringp, const char *__restrict delim)
+_strsep:
+	pop	bc
+	pop	hl
+	pop	de
+	push	de
+	push	hl
+	push	bc
+	push	hl		; stringp
+	ld	hl, (hl)
+	add	hl, de
+	or	a, a
+	sbc	hl, de
+	jr	z, .ret_null
+	push	de		; delim
+	push	hl		; *stringp
+	call	_strcspn
+	pop	de
+	pop	de
+	pop	iy		; stringp
+	ld	de, (iy)
+	add	hl, de		; *stringp + length
+	xor	a, a
+	cp	a, (hl)		; test for the nul terminator
+	jr	nz, .not_last_token
+	sbc	hl, hl		; last token
+	jr	.finish
+.not_last_token:
+	ld	(hl), a		; nul terminate
+	inc	hl		; next token
+.finish:
+	ld	(iy), hl	; store the next token
+	ex	de, hl
+	; return *stringp
+	ret
+.ret_null:
+	pop	de
+	ret
+
+	extern	_strcspn

src/libcxx/include/cstring

@@ -36,6 +36,7 @@ using ::strstr;
 using ::strrstr;
 using ::strcasestr;
 using ::strtok;
+using ::strsep;
 using ::strdup;
 using ::strndup;
 using ::strcspn;

test/standalone/asprintf_fprintf/src/main.c

@@ -100,6 +100,9 @@ char *T_strchrnul(const char *s, int c)
 char *T_strrstr(const char *haystack, const char *needle)
     __attribute__((nonnull(1, 2)));
 
+char *T_strsep(char **__restrict s, const char *__restrict delim)
+    __attribute__((nonnull(1, 2)));
+
 void T_bzero(void* s, size_t n);
 
 #else
@@ -121,6 +124,7 @@ void T_bzero(void* s, size_t n);
 #define T_strncmp strncmp
 #define T_strchrnul strchrnul
 #define T_strrstr strrstr
+#define T_strsep strsep
 #define T_bzero bzero
 
 #endif
@@ -1017,6 +1021,75 @@ int strchrnul_test(void) {
     return 0;
 }
 
+static char *truth_strsep(char **__restrict stringp, const char *__restrict delim) {
+    char * const begin_str = *stringp;
+    if (begin_str == NULL) {
+        return NULL;
+    }
+    size_t length = strcspn(begin_str, delim);
+    char * end_str = begin_str + length;
+    if (*end_str != '\0') {
+        *end_str++ = '\0';
+        *stringp = end_str;
+    } else {
+        *stringp = NULL;
+    }
+    return begin_str;
+}
+
+static int strsep_loop_test(char * str_1, char * str_2) {
+    for (;;) {
+        char *__restrict prev_1 = T_strsep(&str_1, ", .");
+        char *__restrict prev_2 = truth_strsep(&str_2, ", .");
+        if (str_1 == NULL || str_2 == NULL) {
+            break;
+        }
+        ptrdiff_t diff_1 = (str_1 - prev_1);
+        ptrdiff_t diff_2 = (str_2 - prev_2);
+        if (diff_1 != diff_2) {
+            test_printf("%td != %td\n%p %p\n1: %.20s\n2: %.20s\n", diff_1, diff_2, prev_1, prev_2, str_1, str_2);
+            return __LINE__;
+        }
+        C(diff_1 == diff_2);
+    }
+    C(str_1 == NULL && str_2 == NULL);
+    return 0;
+}
+
+int strsep_test(char** dup_1, char** dup_2) {
+    {
+        char *ptr = NULL_ptr;
+        C(T_strsep(&ptr, SINK) == NULL);
+        C(T_strsep(&ptr, NULL_ptr) == NULL);
+        C(T_strsep((char**)SINK, SINK) == NULL);
+        C(T_strsep((char**)SINK, NULL_ptr) == NULL);
+    }
+    const size_t len = strlen(gnu_copypasta);
+    const size_t size = len + 1;
+    *dup_1 = strdup(gnu_copypasta);
+    *dup_2 = strndup(gnu_copypasta, len);
+    C(*dup_1 != NULL && *dup_2 != NULL);
+    C(strcmp(*dup_1, *dup_2) == 0);
+    {
+        char *ptr, *prev;
+        ptr = *dup_2;
+        prev = T_strsep(&ptr, "");
+        C(ptr == NULL);
+        C(prev == *dup_2);
+        ptr = *dup_2;
+        prev = T_strsep(&ptr, "zZ");
+        C(ptr == NULL);
+        C(prev == *dup_2);
+        C(memcmp(*dup_1, *dup_2, size) == 0);
+    }
+    {
+        int ret;
+        TEST(strsep_loop_test(*dup_1, *dup_2));
+        C(memcmp(*dup_1, *dup_2, size) == 0);
+    }
+    return 0;
+}
+
 int run_tests(void) {
     int ret = 0;
 
@@ -1051,6 +1124,17 @@ int run_tests(void) {
     TEST(strrstr_test());
     TEST(strchrnul_test());
 
+    /* strsep */ {
+        char *dup_1 = SINK, *dup_2 = SINK;
+        ret = strsep_test(&dup_1, &dup_2);
+        if (dup_1 == NULL || dup_2 == NULL) {
+            perror("str(n)dup returned NULL");
+        }
+        free(dup_1); dup_1 = NULL;
+        free(dup_2); dup_2 = NULL;
+        if (ret != 0) { return ret; }
+    }
+
     return 0;
 }
 

test/standalone/asprintf_fprintf/src/rename.asm

@@ -3,7 +3,7 @@
 	section	.text
 
 	public	_T_memset, _T_memcpy, _T_memmove, _T_memcmp, _T_memccpy, _T_mempcpy, _T_memrchr, _T_memmem, _T_memrmem
-	public	_T_strlen, _T_strcmp, _T_strncmp, _T_stpcpy, _T_stpncpy, _T_strlcat, _T_strchrnul, _T_strrstr
+	public	_T_strlen, _T_strcmp, _T_strncmp, _T_stpcpy, _T_stpncpy, _T_strlcat, _T_strchrnul, _T_strrstr, _T_strsep
 	public	_T_bzero
 
 _T_memset := _memset
@@ -24,6 +24,7 @@ _T_stpncpy := _stpncpy
 _T_strlcat := _strlcat
 _T_strchrnul := _strchrnul
 _T_strrstr := _strrstr
+_T_strsep := _strsep
 
 _T_bzero := _bzero
 
@@ -35,5 +36,5 @@ _ZERO_size:
 	db	$00, $00, $00
 
 	extern	_memset, _memcpy, _memmove, _memcmp, _memccpy, _mempcpy, _memrchr, _memmem, _memrmem
-	extern	_strlen, _strcmp, _strncmp, _stpcpy, _stpncpy, _strlcat, _strchrnul, _strrstr
+	extern	_strlen, _strcmp, _strncmp, _stpcpy, _stpncpy, _strlcat, _strchrnul, _strrstr, _strsep
 	extern	_bzero