Prepare for 0.5.5.0; add s6rc_livedir_canon

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

2 files changed, 26 insertions, 0 deletions

diff --git a/src/libs6rc/deps-lib/s6rc b/src/libs6rc/deps-lib/s6rc
index 52c220f..5dbb4de 100644
--- a/src/libs6rc/deps-lib/s6rc
+++ b/src/libs6rc/deps-lib/s6rc
@@ -5,6 +5,7 @@ s6rc_db_read.o
 s6rc_db_read_sizes.o
 s6rc_db_read_uint32.o
 s6rc_graph_closure.o
+s6rc_livedir_canon.o
 s6rc_livedir_create.o
 s6rc_livedir_prefix.o
 s6rc_livedir_prefixsize.o
diff --git a/src/libs6rc/s6rc_livedir_canon.c b/src/libs6rc/s6rc_livedir_canon.c
new file mode 100644
index 0000000..db5d3a1
--- /dev/null
+++ b/src/libs6rc/s6rc_livedir_canon.c
@@ -0,0 +1,25 @@
+/* ISC license. */
+
+#include <string.h>
+#include <errno.h>
+
+#include <skalibs/alloc.h>
+
+#include <s6-rc/s6rc-utils.h>
+
+int s6rc_livedir_canon (char const **live)
+{
+  size_t llen = strlen(*live) ;
+  size_t n = llen ;
+  while (n && (*live)[n - 1] == '/') --n ;
+  if (!n) return (errno = EINVAL, 0) ;
+  if (n < llen)
+  {
+    char *x = alloc(n + 1) ;
+    if (!x) return 0 ;
+    memcpy(x, *live, n) ;
+    x[n] = 0 ;
+    *live = x ;
+  }
+  return 1 ;
+}