Make split_cstr func work with multi-char delimiters

sparky-game · Dec 7, 2024 · 6f64d63 · 6f64d63
1 parent 93629e6
commit 6f64d63
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/carbon_strlist.c b/src/carbon_strlist.c
@@ -29,11 +29,15 @@ CBN_StrList carbon_strlist_create(u8 unique) {
 CBN_StrList carbon_strlist_from_splitted_cstr(const char *s, const char *delim) {
   CBN_StrList sl = carbon_strlist_create(false);
   char *s_copy = carbon_string_dup(s);
-  char *sub = strtok(s_copy, delim);
-  while (sub) {
-    carbon_strlist_push(&sl, sub);
-    sub = strtok(0, delim);
+  usz delim_len = strlen(delim);
+  char *start = s_copy;
+  char *found;
+  while ((found = strstr(start, delim))) {
+    *found = 0;
+    carbon_strlist_push(&sl, start);
+    start = found + delim_len;
   }
+  if (*start) carbon_strlist_push(&sl, start);
   CARBON_FREE(s_copy);
   return sl;
 }