From e8fe8ed8117bb1a58cd588b295352875d3c08c1a Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sat, 21 Jul 2018 11:16:11 +0000
Subject:  Remove mininetstring, absolutepath, absolutepath_tmp

---
 src/include/skalibs/djbunix.h       |  3 ---
 src/include/skalibs/mininetstring.h | 12 -----------
 src/include/skalibs/stddjb.h        |  1 -
 src/libstddjb/mininetstring_read.c  | 43 -------------------------------------
 src/libstddjb/mininetstring_write.c | 36 -------------------------------
 src/libstddjb/sarealpath.c          |  2 +-
 src/libstddjb/sarealpath_tmp.c      | 11 ----------
 7 files changed, 1 insertion(+), 107 deletions(-)
 delete mode 100644 src/include/skalibs/mininetstring.h
 delete mode 100644 src/libstddjb/mininetstring_read.c
 delete mode 100644 src/libstddjb/mininetstring_write.c
 delete mode 100644 src/libstddjb/sarealpath_tmp.c

(limited to 'src')

diff --git a/src/include/skalibs/djbunix.h b/src/include/skalibs/djbunix.h
index d3edc97..b8bb85c 100644
--- a/src/include/skalibs/djbunix.h
+++ b/src/include/skalibs/djbunix.h
@@ -9,7 +9,6 @@
 #include <skalibs/gccattributes.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/envalloc.h>
-#include <skalibs/env.h>        /* will disappear */
 #include <skalibs/posixplz.h>
 
 #define DJBUNIX_FLAG_NB  0x01U
@@ -92,9 +91,7 @@ extern int waitn_reap (pid_t *, unsigned int) ;
 
 extern int fd_chdir (int) ;
 
-#define absolutepath(sa, s) sarealpath(sa, s) /* will disappear */
 extern int sarealpath (stralloc *, char const *) ;
-extern int sarealpath_tmp (stralloc *, char const *, stralloc *) ;
 extern int sabasename (stralloc *, char const *, size_t) ;
 extern int sadirname (stralloc *, char const *, size_t) ;
 extern int sagetcwd (stralloc *) ;
diff --git a/src/include/skalibs/mininetstring.h b/src/include/skalibs/mininetstring.h
deleted file mode 100644
index 1997b18..0000000
--- a/src/include/skalibs/mininetstring.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* ISC license. */
-
-#ifndef MININETSTRING_H
-#define MININETSTRING_H
-
-#include <stdint.h>
-#include <skalibs/stralloc.h>
-
-extern int mininetstring_read (int, stralloc *, uint32_t *) ;
-extern int mininetstring_write (int, char const *, uint16_t, uint32_t *) ;
-
-#endif
diff --git a/src/include/skalibs/stddjb.h b/src/include/skalibs/stddjb.h
index 87f72d0..aa90f6a 100644
--- a/src/include/skalibs/stddjb.h
+++ b/src/include/skalibs/stddjb.h
@@ -37,7 +37,6 @@
 #include <skalibs/iobuffer.h>
 #include <skalibs/iopause.h>
 #include <skalibs/lolstdio.h>
-#include <skalibs/mininetstring.h> /* will disappear */
 #include <skalibs/netstring.h>
 #include <skalibs/nsig.h>
 #include <skalibs/segfault.h>
diff --git a/src/libstddjb/mininetstring_read.c b/src/libstddjb/mininetstring_read.c
deleted file mode 100644
index 34f7a75..0000000
--- a/src/libstddjb/mininetstring_read.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ISC license. */
-
-#include <errno.h>
-#include <skalibs/allreadwrite.h>
-#include <skalibs/stralloc.h>
-#include <skalibs/mininetstring.h>
-
-int mininetstring_read (int fd, stralloc *sa, uint32_t *w)
-{
-  if (!*w)
-  {
-    char pack[2] ;
-    switch (fd_read(fd, 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 ;
-}
diff --git a/src/libstddjb/mininetstring_write.c b/src/libstddjb/mininetstring_write.c
deleted file mode 100644
index c5b3aba..0000000
--- a/src/libstddjb/mininetstring_write.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ISC license. */
-
-#include <errno.h>
-#include <skalibs/uint16.h>
-#include <skalibs/allreadwrite.h>
-#include <skalibs/mininetstring.h>
-
-int mininetstring_write (int fd, char const *s, uint16_t len, uint32_t *w)
-{
-  if (!*w)
-  {
-    char pack[2] ;
-    uint16_pack_big(pack, len) ;
-    switch (fd_write(fd, pack, 2))
-    {
-      case -1 : return -1 ;
-      case 0 : return (errno = EAGAIN, -1) ;
-      case 1 : *w = (1U << 31) ; break ;
-      case 2 : *w = len ; break ;
-      default : return (errno = EDOM, -1) ;
-    }
-  }
-  if (*w & (1U << 31))
-  {
-    unsigned char c = len & 0xFFU ;
-    switch (fd_write(fd, (char const *)&c, 1))
-    {
-      case -1 : return -1 ;
-      case 0 : return (errno = EAGAIN, -1) ;
-      case 1 : *w = len ; break ;
-      default : return (errno = EDOM, -1) ;
-    }
-  }
-  *w -= allwrite(fd, s + len - *w, *w) ;
-  return *w ? -1 : 1 ;
-}
diff --git a/src/libstddjb/sarealpath.c b/src/libstddjb/sarealpath.c
index 0cf1825..28631c6 100644
--- a/src/libstddjb/sarealpath.c
+++ b/src/libstddjb/sarealpath.c
@@ -18,7 +18,7 @@ int sarealpath (stralloc *sa, char const *path)
   {
     char *p = realpath(path, 0) ;
     if (!p) return -1 ;
-    sa->s = p ;
+    sa->s = p ; /* XXX: incompatible with alloc() interposition */
     sa->len = strlen(p) ;
     sa->a = sa->len + 1 ;
   }
diff --git a/src/libstddjb/sarealpath_tmp.c b/src/libstddjb/sarealpath_tmp.c
deleted file mode 100644
index 31aeeb2..0000000
--- a/src/libstddjb/sarealpath_tmp.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/* ISC license. */
-
-/* This function is now obsolete. */
-
-#include <skalibs/djbunix.h>
-
-int sarealpath_tmp (stralloc *sa, char const *path, stralloc *tmp)
-{
-  (void)tmp ;
-  return sarealpath(sa, path) ;
-}
-- 
cgit v1.2.3