Add skagetln_nofill

3 files changed, 22 insertions, 10 deletions

diff --git a/src/include/skalibs/skamisc.h b/src/include/skalibs/skamisc.h
index bdc4869..4b76fb7 100644
--- a/src/include/skalibs/skamisc.h
+++ b/src/include/skalibs/skamisc.h
@@ -9,6 +9,7 @@
 extern stralloc satmp ;
 
 extern int skagetln (buffer *, stralloc *, char) ;
+extern int skagetln_nofill (buffer *, stralloc *, char) ;
 extern int skagetlnsep (buffer *, stralloc *, char const *, unsigned int) ;
 extern int getlnmax (buffer *, char *, unsigned int, unsigned int *, char) ;
 extern int getlnmaxsep (buffer *, char *, unsigned int, unsigned int *, char const *, unsigned int) ;
diff --git a/src/libstddjb/skagetln.c b/src/libstddjb/skagetln.c
index 056cc38..05775f6 100644
--- a/src/libstddjb/skagetln.c
+++ b/src/libstddjb/skagetln.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <skalibs/buffer.h>
-#include <skalibs/siovec.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/skamisc.h>
 
@@ -11,15 +10,8 @@ int skagetln (buffer *b, stralloc *sa, char sep)
   unsigned int start = sa->len ;
   for (;;)
   {
-    siovec_t v[2] ;
-    unsigned int pos ;
-    int r ;
-    buffer_rpeek(b, v) ;
-    pos = siovec_bytechr(v, 2, sep) ;
-    r = pos < buffer_len(b) ; pos += r ;
-    if (!stralloc_readyplus(sa, pos)) return -1 ;
-    buffer_getnofill(b, sa->s + sa->len, pos) ; sa->len += pos ;
-    if (r) return 1 ;
+    register int r = skagetln_nofill(b, sa, sep) ;
+    if (r) return r ;
     r = buffer_fill(b) ;
     if (r < 0) return r ;
     if (!r) return (sa->s && (sa->len > start)) ? (errno = EPIPE, -1) : 0 ;
diff --git a/src/libstddjb/skagetln_nofill.c b/src/libstddjb/skagetln_nofill.c
new file mode 100644
index 0000000..7e25760
--- /dev/null
+++ b/src/libstddjb/skagetln_nofill.c
@@ -0,0 +1,19 @@
+/* ISC license. */
+
+#include <skalibs/buffer.h>
+#include <skalibs/siovec.h>
+#include <skalibs/stralloc.h>
+#include <skalibs/skamisc.h>
+
+int skagetln_nofill (buffer *b, stralloc *sa, char sep)
+{
+  siovec_t v[2] ;
+  unsigned int pos ;
+  int r ;
+  buffer_rpeek(b, v) ;
+  pos = siovec_bytechr(v, 2, sep) ;
+  r = pos < buffer_len(b) ; pos += r ;
+  if (!stralloc_readyplus(sa, pos)) return -1 ;
+  buffer_getnofill(b, sa->s + sa->len, pos) ; sa->len += pos ;
+  return r ;
+}