skalibs

commit af1ae27abbb0e80f59f4848c4fe7ccaee3690382
parent 45923c08b00ccdfd888caf6d2b555a137c563988
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date:   Sat, 21 Oct 2017 00:41:20 +0000

 Bugfix: getlnmax(sep) needs to include the terminating byte when found

Diffstat:
M
src/libstddjb/getlnmax.c
 | 
4
++--
M
src/libstddjb/getlnmaxsep.c
 | 
4
++--

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/libstddjb/getlnmax.c b/src/libstddjb/getlnmax.c
@@ -19,8 +19,8 @@ int getlnmax (buffer *b, char *d, size_t max, size_t *w, char sep)
     if (len > max - *w) len = max - *w ;
     pos = siovec_bytechr(v, 2, sep) ;
     if (pos > len) pos = len ;
-    r = pos < len ;
-    buffer_getnofill(b, d + *w, pos + r) ; *w += pos ;
+    r = pos < len ; pos += r ;
+    buffer_getnofill(b, d + *w, pos) ; *w += pos ;
     if (*w >= max) return (errno = ERANGE, -1) ;
     if (r) return 1 ;
     r = buffer_fill(b) ;
diff --git a/src/libstddjb/getlnmaxsep.c b/src/libstddjb/getlnmaxsep.c
@@ -19,8 +19,8 @@ int getlnmaxsep (buffer *b, char *d, size_t max, size_t *w, char const *sep, siz
     if (len > max - *w) len = max - *w ;
     pos = siovec_bytein(v, 2, sep, seplen) ;
     if (pos > len) pos = len ;
-    r = pos < len ;
-    buffer_getnofill(b, d + *w, pos + r) ; *w += pos ;
+    r = pos < len ; pos += r ;
+    buffer_getnofill(b, d + *w, pos) ; *w += pos ;
     if (*w >= max) return (errno = ERANGE, -1) ;
     if (r) return 1 ;
     r = buffer_fill(b) ;