Prepare for 2.14.3.0; add mininetstring_read, cplz.h

Signed-off-by: Laurent Bercot <ska@appnovation.com>

4 files changed, 61 insertions, 0 deletions

diff --git a/src/include/skalibs/cplz.h b/src/include/skalibs/cplz.h
new file mode 100644
index 0000000..232c2e0
--- /dev/null
+++ b/src/include/skalibs/cplz.h
@@ -0,0 +1,12 @@
+/* ISC license. */
+
+#ifndef SKALIBS_CPLZ_H
+#define SKALIBS_CPLZ_H
+
+ /*
+    Tricks to work around misdesigns of C.
+ */
+
+#define LAUNDER(p) do { void *_p = p ; asm volatile("" : "+r"(_p) ::) ; _p ; } while (0)
+
+#endif
diff --git a/src/include/skalibs/netstring.h b/src/include/skalibs/netstring.h
index 24879c2..92a64d1 100644
--- a/src/include/skalibs/netstring.h
+++ b/src/include/skalibs/netstring.h
@@ -3,6 +3,7 @@
 #ifndef SKALIBS_NETSTRING_H
 #define SKALIBS_NETSTRING_H
 
+#include <stdint.h>
 #include <string.h>
 #include <sys/uio.h>
 
@@ -23,4 +24,6 @@ extern int netstring_put (buffer *, char const *, size_t, size_t *) ;
 #define netstring_putba(ba, s, n) netstring_appendb(&(ba)->x, s, n)
 #define netstring_putbav(ba, v, n) netstring_appendv(&(ba)->x, v, n)
 
+extern int mininetstring_read (int, stralloc *, uint32_t *) ;
+
 #endif
diff --git a/src/include/skalibs/skalibs.h b/src/include/skalibs/skalibs.h
index 60c9577..2c55ef2 100644
--- a/src/include/skalibs/skalibs.h
+++ b/src/include/skalibs/skalibs.h
@@ -13,6 +13,7 @@
    - skalibs/posixishard.h: post-system headers workarounds for conformance failures
 */
 
+#include <skalibs/cplz.h>
 #include <skalibs/posixplz.h>
 #include <skalibs/stddjb.h>
 #include <skalibs/strerr.h>
diff --git a/src/libstddjb/mininetstring_read.c b/src/libstddjb/mininetstring_read.c
new file mode 100644
index 0000000..b4439c9
--- /dev/null
+++ b/src/libstddjb/mininetstring_read.c
@@ -0,0 +1,45 @@
+/* ISC license. */
+
+#include <stdint.h>
+#include <errno.h>
+
+#include <skalibs/allreadwrite.h>
+#include <skalibs/stralloc.h>
+#include <skalibs/netstring.h>
+
+int mininetstring_read (int fd, stralloc *sa, uint32_t *w)
+{
+  if (!*w)
+  {
+    unsigned char pack[2] ;
+    switch (fd_read(fd, (char *)pack, 2))
+    {
+      case -1 : return -1 ;
+      case 0 : return 0 ;
+      case 1 : *w = ((uint32_t)pack[0] << 8) | (1U << 31) ; break ;
+      case 2 : *w = ((uint32_t)pack[0] << 8) | (uint32_t)pack[1] | (1U << 30) ; break ;
+      default : return (errno = EDOM, -1) ;
+    }
+  }
+  if (*w & (1U << 31))
+  {
+    unsigned char c ;
+    switch (fd_read(fd, (char *)&c, 1))
+    {
+      case -1 : return -1 ;
+      case 0 : return (errno = EPIPE, -1) ;
+      case 1 : *w |= (uint32_t)c | (1U << 30) ; *w &= ~(1U << 31) ; break ;
+      default : return (errno = EDOM, -1) ;
+    }
+  }
+  if (*w & (1U << 30))
+  {
+    if (!stralloc_readyplus(sa, *w & ~(1U << 30))) return -1 ;
+    *w &= ~(1U << 30) ;
+  }
+  {
+    size_t r = allread(fd, sa->s + sa->len, *w) ;
+    sa->len += r ; *w -= r ;
+  }
+  return *w ? -1 : 1 ;
+}