Add string_index

3 files changed, 34 insertions, 5 deletions

diff --git a/package/deps.mak b/package/deps.mak
index e35a948..a5db027 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -31,7 +31,6 @@ src/include/skalibs/genset.h: src/include/skalibs/functypes.h
 src/include/skalibs/gensetdyn.h: src/include/skalibs/functypes.h src/include/skalibs/genalloc.h src/include/skalibs/stralloc.h
 src/include/skalibs/gol.h: src/include/skalibs/uint64.h
 src/include/skalibs/iopause.h: src/include/skalibs/tai.h
-src/include/skalibs/ip46.h: src/include/skalibs/fmtscan.h src/include/skalibs/socket.h src/include/skalibs/tai.h
 src/include/skalibs/keventbridge.h: src/include/skalibs/sysdeps.h
 src/include/skalibs/kolbak.h: src/include/skalibs/unixmessage.h
 src/include/skalibs/lolstdio.h: src/include/skalibs/bufalloc.h src/include/skalibs/buffer.h src/include/skalibs/strerr.h
@@ -47,7 +46,7 @@ src/include/skalibs/sig.h: src/include/skalibs/gccattributes.h
 src/include/skalibs/siovec.h: src/include/skalibs/gccattributes.h
 src/include/skalibs/skaclient.h: src/include/skalibs/kolbak.h src/include/skalibs/tai.h src/include/skalibs/unixmessage.h
 src/include/skalibs/skalibs.h: src/include/skalibs/cplz.h src/include/skalibs/datastruct.h src/include/skalibs/envexec.h src/include/skalibs/playnice.h src/include/skalibs/posixplz.h src/include/skalibs/random.h src/include/skalibs/stdcrypto.h src/include/skalibs/stddjb.h src/include/skalibs/unixonacid.h
-src/include/skalibs/skamisc.h: src/include/skalibs/buffer.h src/include/skalibs/stralloc.h
+src/include/skalibs/skamisc.h: src/include/skalibs/buffer.h src/include/skalibs/genalloc.h src/include/skalibs/stralloc.h
 src/include/skalibs/socket.h: src/include/skalibs/fcntl.h src/include/skalibs/gccattributes.h src/include/skalibs/posixplz.h src/include/skalibs/tai.h
 src/include/skalibs/stat.h: src/include/skalibs/sysdeps.h
 src/include/skalibs/stdcrypto.h: src/include/skalibs/blake2s.h src/include/skalibs/crc32c.h src/include/skalibs/sha1.h src/include/skalibs/sha256.h src/include/skalibs/sha512.h
@@ -57,9 +56,6 @@ src/include/skalibs/strerr2.h: src/include/skalibs/strerr.h
 src/include/skalibs/tai.h: src/include/skalibs/gccattributes.h src/include/skalibs/uint64.h
 src/include/skalibs/textclient.h: src/include/skalibs/allreadwrite.h src/include/skalibs/tai.h src/include/skalibs/textmessage.h
 src/include/skalibs/textmessage.h: src/include/skalibs/allreadwrite.h src/include/skalibs/bufalloc.h src/include/skalibs/buffer.h src/include/skalibs/gccattributes.h src/include/skalibs/stralloc.h src/include/skalibs/tai.h
-src/include/skalibs/types.h: src/include/skalibs/uint16.h src/include/skalibs/uint32.h src/include/skalibs/uint64.h
-src/include/skalibs/uint16.h: src/include/skalibs/uint64.h
-src/include/skalibs/uint32.h: src/include/skalibs/uint64.h
 src/include/skalibs/unix-timed.h: src/include/skalibs/bufalloc.h src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/stralloc.h src/include/skalibs/tai.h
 src/include/skalibs/unix-transactional.h: src/include/skalibs/direntry.h src/include/skalibs/gccattributes.h src/include/skalibs/stralloc.h
 src/include/skalibs/unixconnection.h: src/include/skalibs/unixmessage.h
@@ -616,6 +612,7 @@ src/libstddjb/stralloc_reverse_blocks.o src/libstddjb/stralloc_reverse_blocks.lo
 src/libstddjb/stralloc_shrink.o src/libstddjb/stralloc_shrink.lo: src/libstddjb/stralloc_shrink.c src/include/skalibs/alloc.h src/include/skalibs/stralloc.h
 src/libstddjb/stralloc_zero.o src/libstddjb/stralloc_zero.lo: src/libstddjb/stralloc_zero.c src/include/skalibs/stralloc.h
 src/libstddjb/string_format.o src/libstddjb/string_format.lo: src/libstddjb/string_format.c src/include/skalibs/bytestr.h src/include/skalibs/stralloc.h
+src/libstddjb/string_index.o src/libstddjb/string_index.lo: src/libstddjb/string_index.c src/include/skalibs/genalloc.h src/include/skalibs/skamisc.h
 src/libstddjb/string_quote.o src/libstddjb/string_quote.lo: src/libstddjb/string_quote.c src/include/skalibs/skamisc.h src/include/skalibs/stralloc.h
 src/libstddjb/string_quote_nodelim_mustquote.o src/libstddjb/string_quote_nodelim_mustquote.lo: src/libstddjb/string_quote_nodelim_mustquote.c src/include/skalibs/fmtscan.h src/include/skalibs/skamisc.h src/include/skalibs/stralloc.h
 src/libstddjb/string_unquote.o src/libstddjb/string_unquote.lo: src/libstddjb/string_unquote.c src/include/skalibs/skamisc.h
diff --git a/src/include/skalibs/skamisc.h b/src/include/skalibs/skamisc.h
index 6a03e7a..89d7744 100644
--- a/src/include/skalibs/skamisc.h
+++ b/src/include/skalibs/skamisc.h
@@ -7,6 +7,7 @@
 
 #include <skalibs/buffer.h>
 #include <skalibs/stralloc.h>
+#include <skalibs/genalloc.h>
 
 extern stralloc satmp ;
 
@@ -37,5 +38,6 @@ extern ssize_t string_unquote_nodelim (char *, char const *, size_t) ;
 extern int string_unquote_withdelim (char *, size_t *, char const *, size_t, size_t *, char const *, size_t) ;
 
 extern int string_format (stralloc *, char const *, char const *, char const *const *) ;
+extern int string_index (char *, size_t, size_t, char, genalloc *) ;
 
 #endif
diff --git a/src/libstddjb/string_index.c b/src/libstddjb/string_index.c
new file mode 100644
index 0000000..c352e77
--- /dev/null
+++ b/src/libstddjb/string_index.c
@@ -0,0 +1,30 @@
+/* ISC license. */
+
+#include <skalibs/genalloc.h>
+#include <skalibs/skamisc.h>
+
+int string_index (char *s, size_t start, size_t len, char delim, genalloc *indices)
+{
+  size_t origlen = genalloc_len(size_t, indices) ;
+  size_t pos = start ;
+  int wasnull = !indices->s ;
+  int inword = 0 ;
+
+  for (size_t i = start ; i < len ; i++)
+  {
+    if (s[i] == delim)
+    {
+      s[i] = 0 ;
+      if (!genalloc_append(size_t, indices, &pos)) goto err ;
+      inword = 0 ;
+    }
+    else if (!inword) { pos = i ; inword = 1 ; }
+  }
+  if (inword) goto err ;
+  return 1 ;
+
+ err:
+  if (wasnull) genalloc_free(size_t, indices) ;
+  else genalloc_setlen(size_t, indices, origlen) ;
+  return 0 ;
+}