90 files changed, 44 insertions, 51 deletions

diff --git a/src/multicall/deps-exe/s6-portable-utils b/src/multicall/deps-exe/s6-portable-utils
new file mode 100644
index 0000000..39597dd
--- /dev/null
+++ b/src/multicall/deps-exe/s6-portable-utils
@@ -0,0 +1,2 @@
+-lskarnet
+${SPAWN_LIB}
diff --git a/src/skaembutils/deps-exe/s6-basename b/src/s6-portable-utils/deps-exe/s6-basename
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-basename
+++ b/src/s6-portable-utils/deps-exe/s6-basename
diff --git a/src/skaembutils/deps-exe/s6-cat b/src/s6-portable-utils/deps-exe/s6-cat
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-cat
+++ b/src/s6-portable-utils/deps-exe/s6-cat
diff --git a/src/skaembutils/deps-exe/s6-chmod b/src/s6-portable-utils/deps-exe/s6-chmod
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-chmod
+++ b/src/s6-portable-utils/deps-exe/s6-chmod
diff --git a/src/skaembutils/deps-exe/s6-chown b/src/s6-portable-utils/deps-exe/s6-chown
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-chown
+++ b/src/s6-portable-utils/deps-exe/s6-chown
diff --git a/src/skaembutils/deps-exe/s6-clock b/src/s6-portable-utils/deps-exe/s6-clock
index a11a5f4..a11a5f4 100644
--- a/src/skaembutils/deps-exe/s6-clock
+++ b/src/s6-portable-utils/deps-exe/s6-clock
diff --git a/src/skaembutils/deps-exe/s6-cut b/src/s6-portable-utils/deps-exe/s6-cut
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-cut
+++ b/src/s6-portable-utils/deps-exe/s6-cut
diff --git a/src/skaembutils/deps-exe/s6-dirname b/src/s6-portable-utils/deps-exe/s6-dirname
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-dirname
+++ b/src/s6-portable-utils/deps-exe/s6-dirname
diff --git a/src/skaembutils/deps-exe/s6-dumpenv b/src/s6-portable-utils/deps-exe/s6-dumpenv
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-dumpenv
+++ b/src/s6-portable-utils/deps-exe/s6-dumpenv
diff --git a/src/skaembutils/deps-exe/s6-echo b/src/s6-portable-utils/deps-exe/s6-echo
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-echo
+++ b/src/s6-portable-utils/deps-exe/s6-echo
diff --git a/src/skaembutils/deps-exe/s6-env b/src/s6-portable-utils/deps-exe/s6-env
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-env
+++ b/src/s6-portable-utils/deps-exe/s6-env
diff --git a/src/skaembutils/deps-exe/s6-expr b/src/s6-portable-utils/deps-exe/s6-expr
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-expr
+++ b/src/s6-portable-utils/deps-exe/s6-expr
diff --git a/src/skaembutils/deps-exe/s6-false b/src/s6-portable-utils/deps-exe/s6-false
index e69de29..e69de29 100644
--- a/src/skaembutils/deps-exe/s6-false
+++ b/src/s6-portable-utils/deps-exe/s6-false
diff --git a/src/skaembutils/deps-exe/s6-format-filter b/src/s6-portable-utils/deps-exe/s6-format-filter
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-format-filter
+++ b/src/s6-portable-utils/deps-exe/s6-format-filter
diff --git a/src/skaembutils/deps-exe/s6-grep b/src/s6-portable-utils/deps-exe/s6-grep
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-grep
+++ b/src/s6-portable-utils/deps-exe/s6-grep
diff --git a/src/skaembutils/deps-exe/s6-head b/src/s6-portable-utils/deps-exe/s6-head
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-head
+++ b/src/s6-portable-utils/deps-exe/s6-head
diff --git a/src/skaembutils/deps-exe/s6-hiercopy b/src/s6-portable-utils/deps-exe/s6-hiercopy
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-hiercopy
+++ b/src/s6-portable-utils/deps-exe/s6-hiercopy
diff --git a/src/skaembutils/deps-exe/s6-linkname b/src/s6-portable-utils/deps-exe/s6-linkname
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-linkname
+++ b/src/s6-portable-utils/deps-exe/s6-linkname
diff --git a/src/skaembutils/deps-exe/s6-ls b/src/s6-portable-utils/deps-exe/s6-ln
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-ls
+++ b/src/s6-portable-utils/deps-exe/s6-ln
diff --git a/src/skaembutils/deps-exe/s6-mkdir b/src/s6-portable-utils/deps-exe/s6-ls
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-mkdir
+++ b/src/s6-portable-utils/deps-exe/s6-ls
diff --git a/src/skaembutils/deps-exe/s6-maximumtime b/src/s6-portable-utils/deps-exe/s6-maximumtime
index 756dcc2..756dcc2 100644
--- a/src/skaembutils/deps-exe/s6-maximumtime
+++ b/src/s6-portable-utils/deps-exe/s6-maximumtime
diff --git a/src/skaembutils/deps-exe/s6-mkfifo b/src/s6-portable-utils/deps-exe/s6-mkdir
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-mkfifo
+++ b/src/s6-portable-utils/deps-exe/s6-mkdir
diff --git a/src/skaembutils/deps-exe/s6-nice b/src/s6-portable-utils/deps-exe/s6-mkfifo
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-nice
+++ b/src/s6-portable-utils/deps-exe/s6-mkfifo
diff --git a/src/skaembutils/deps-exe/s6-nuke b/src/s6-portable-utils/deps-exe/s6-nice
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-nuke
+++ b/src/s6-portable-utils/deps-exe/s6-nice
diff --git a/src/skaembutils/deps-exe/s6-pause b/src/s6-portable-utils/deps-exe/s6-nuke
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-pause
+++ b/src/s6-portable-utils/deps-exe/s6-nuke
diff --git a/src/skaembutils/deps-exe/s6-printenv b/src/s6-portable-utils/deps-exe/s6-pause
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-printenv
+++ b/src/s6-portable-utils/deps-exe/s6-pause
diff --git a/src/skaembutils/deps-exe/s6-quote b/src/s6-portable-utils/deps-exe/s6-printenv
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-quote
+++ b/src/s6-portable-utils/deps-exe/s6-printenv
diff --git a/src/skaembutils/deps-exe/s6-quote-filter b/src/s6-portable-utils/deps-exe/s6-quote
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-quote-filter
+++ b/src/s6-portable-utils/deps-exe/s6-quote
diff --git a/src/skaembutils/deps-exe/s6-rename b/src/s6-portable-utils/deps-exe/s6-quote-filter
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-rename
+++ b/src/s6-portable-utils/deps-exe/s6-quote-filter
diff --git a/src/skaembutils/deps-exe/s6-rmrf b/src/s6-portable-utils/deps-exe/s6-rename
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-rmrf
+++ b/src/s6-portable-utils/deps-exe/s6-rename
diff --git a/src/skaembutils/deps-exe/s6-seq b/src/s6-portable-utils/deps-exe/s6-rmrf
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-seq
+++ b/src/s6-portable-utils/deps-exe/s6-rmrf
diff --git a/src/skaembutils/deps-exe/s6-sort b/src/s6-portable-utils/deps-exe/s6-seq
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-sort
+++ b/src/s6-portable-utils/deps-exe/s6-seq
diff --git a/src/skaembutils/deps-exe/s6-sleep b/src/s6-portable-utils/deps-exe/s6-sleep
index a11a5f4..a11a5f4 100644
--- a/src/skaembutils/deps-exe/s6-sleep
+++ b/src/s6-portable-utils/deps-exe/s6-sleep
diff --git a/src/skaembutils/deps-exe/s6-tai64ndiff b/src/s6-portable-utils/deps-exe/s6-sort
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-tai64ndiff
+++ b/src/s6-portable-utils/deps-exe/s6-sort
diff --git a/src/skaembutils/deps-exe/s6-sync b/src/s6-portable-utils/deps-exe/s6-sync
index e69de29..e69de29 100644
--- a/src/skaembutils/deps-exe/s6-sync
+++ b/src/s6-portable-utils/deps-exe/s6-sync
diff --git a/src/skaembutils/deps-exe/s6-tail b/src/s6-portable-utils/deps-exe/s6-tai64ndiff
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-tail
+++ b/src/s6-portable-utils/deps-exe/s6-tai64ndiff
diff --git a/src/skaembutils/deps-exe/s6-touch b/src/s6-portable-utils/deps-exe/s6-tail
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-touch
+++ b/src/s6-portable-utils/deps-exe/s6-tail
diff --git a/src/skaembutils/deps-exe/s6-unquote b/src/s6-portable-utils/deps-exe/s6-touch
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-unquote
+++ b/src/s6-portable-utils/deps-exe/s6-touch
diff --git a/src/skaembutils/deps-exe/s6-true b/src/s6-portable-utils/deps-exe/s6-true
index e69de29..e69de29 100644
--- a/src/skaembutils/deps-exe/s6-true
+++ b/src/s6-portable-utils/deps-exe/s6-true
diff --git a/src/skaembutils/deps-exe/s6-unquote-filter b/src/s6-portable-utils/deps-exe/s6-uniquename
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/s6-unquote-filter
+++ b/src/s6-portable-utils/deps-exe/s6-uniquename
diff --git a/src/skaembutils/deps-exe/seekablepipe b/src/s6-portable-utils/deps-exe/s6-unquote
index e7187fe..e7187fe 100644
--- a/src/skaembutils/deps-exe/seekablepipe
+++ b/src/s6-portable-utils/deps-exe/s6-unquote
diff --git a/src/s6-portable-utils/deps-exe/s6-unquote-filter b/src/s6-portable-utils/deps-exe/s6-unquote-filter
new file mode 100644
index 0000000..e7187fe
--- /dev/null
+++ b/src/s6-portable-utils/deps-exe/s6-unquote-filter
@@ -0,0 +1 @@
+-lskarnet
diff --git a/src/s6-portable-utils/deps-exe/s6-update-symlinks b/src/s6-portable-utils/deps-exe/s6-update-symlinks
new file mode 100644
index 0000000..e7187fe
--- /dev/null
+++ b/src/s6-portable-utils/deps-exe/s6-update-symlinks
@@ -0,0 +1 @@
+-lskarnet
diff --git a/src/s6-portable-utils/deps-exe/seekablepipe b/src/s6-portable-utils/deps-exe/seekablepipe
new file mode 100644
index 0000000..e7187fe
--- /dev/null
+++ b/src/s6-portable-utils/deps-exe/seekablepipe
@@ -0,0 +1 @@
+-lskarnet
diff --git a/src/skaembutils/s6-basename.c b/src/s6-portable-utils/s6-basename.c
index 9e00763..9e00763 100644
--- a/src/skaembutils/s6-basename.c
+++ b/src/s6-portable-utils/s6-basename.c
diff --git a/src/skaembutils/s6-cat.c b/src/s6-portable-utils/s6-cat.c
index 8ff5a47..8ff5a47 100644
--- a/src/skaembutils/s6-cat.c
+++ b/src/s6-portable-utils/s6-cat.c
diff --git a/src/skaembutils/s6-chmod.c b/src/s6-portable-utils/s6-chmod.c
index 946a318..946a318 100644
--- a/src/skaembutils/s6-chmod.c
+++ b/src/s6-portable-utils/s6-chmod.c
diff --git a/src/skaembutils/s6-chown.c b/src/s6-portable-utils/s6-chown.c
index 77cd94b..77cd94b 100644
--- a/src/skaembutils/s6-chown.c
+++ b/src/s6-portable-utils/s6-chown.c
diff --git a/src/skaembutils/s6-clock.c b/src/s6-portable-utils/s6-clock.c
index 5a9e67a..5a9e67a 100644
--- a/src/skaembutils/s6-clock.c
+++ b/src/s6-portable-utils/s6-clock.c
diff --git a/src/skaembutils/s6-cut.c b/src/s6-portable-utils/s6-cut.c
index e55907b..e55907b 100644
--- a/src/skaembutils/s6-cut.c
+++ b/src/s6-portable-utils/s6-cut.c
diff --git a/src/skaembutils/s6-dirname.c b/src/s6-portable-utils/s6-dirname.c
index 83782ac..83782ac 100644
--- a/src/skaembutils/s6-dirname.c
+++ b/src/s6-portable-utils/s6-dirname.c
diff --git a/src/skaembutils/s6-dumpenv.c b/src/s6-portable-utils/s6-dumpenv.c
index 4b79170..4b79170 100644
--- a/src/skaembutils/s6-dumpenv.c
+++ b/src/s6-portable-utils/s6-dumpenv.c
diff --git a/src/skaembutils/s6-echo.c b/src/s6-portable-utils/s6-echo.c
index 11427d2..11427d2 100644
--- a/src/skaembutils/s6-echo.c
+++ b/src/s6-portable-utils/s6-echo.c
diff --git a/src/skaembutils/s6-env.c b/src/s6-portable-utils/s6-env.c
index 01479ce..01479ce 100644
--- a/src/skaembutils/s6-env.c
+++ b/src/s6-portable-utils/s6-env.c
diff --git a/src/skaembutils/s6-expr.c b/src/s6-portable-utils/s6-expr.c
index 91be041..91be041 100644
--- a/src/skaembutils/s6-expr.c
+++ b/src/s6-portable-utils/s6-expr.c
diff --git a/src/skaembutils/s6-false.c b/src/s6-portable-utils/s6-false.c
index 75f483e..75f483e 100644
--- a/src/skaembutils/s6-false.c
+++ b/src/s6-portable-utils/s6-false.c
diff --git a/src/skaembutils/s6-format-filter.c b/src/s6-portable-utils/s6-format-filter.c
index 57b2869..57b2869 100644
--- a/src/skaembutils/s6-format-filter.c
+++ b/src/s6-portable-utils/s6-format-filter.c
diff --git a/src/skaembutils/s6-grep.c b/src/s6-portable-utils/s6-grep.c
index ebfa064..ebfa064 100644
--- a/src/skaembutils/s6-grep.c
+++ b/src/s6-portable-utils/s6-grep.c
diff --git a/src/skaembutils/s6-head.c b/src/s6-portable-utils/s6-head.c
index de7d937..de7d937 100644
--- a/src/skaembutils/s6-head.c
+++ b/src/s6-portable-utils/s6-head.c
diff --git a/src/skaembutils/s6-hiercopy.c b/src/s6-portable-utils/s6-hiercopy.c
index a57dd69..a57dd69 100644
--- a/src/skaembutils/s6-hiercopy.c
+++ b/src/s6-portable-utils/s6-hiercopy.c
diff --git a/src/skaembutils/s6-linkname.c b/src/s6-portable-utils/s6-linkname.c
index 8471ac4..8471ac4 100644
--- a/src/skaembutils/s6-linkname.c
+++ b/src/s6-portable-utils/s6-linkname.c
diff --git a/src/skaembutils/s6-ln.c b/src/s6-portable-utils/s6-ln.c
index b33562f..f0b0c5e 100644
--- a/src/skaembutils/s6-ln.c
+++ b/src/s6-portable-utils/s6-ln.c
@@ -21,7 +21,7 @@
 #include <skalibs/skamisc.h>
 
 #define USAGE "s6-ln [ -n ] [ -s ] [ -f ] [ -L ] [ -P ] src... dest"
-#define SUFFIX ":s6-ln:XXXXXX"
+#define LN_SUFFIX ":s6-ln:XXXXXX"
 
 #ifdef SKALIBS_HASLINKAT
 
@@ -53,9 +53,9 @@ static int ln_doit (char const *old, char const *new, link_func_ref mylink, int
     }
     {
       size_t newlen = strlen(new) ;
-      char fn[newlen + sizeof(SUFFIX)] ;
+      char fn[newlen + sizeof(LN_SUFFIX)] ;
       memcpy(fn, new, newlen) ;
-      memcpy(fn + newlen, SUFFIX, sizeof(SUFFIX)) ;
+      memcpy(fn + newlen, LN_SUFFIX, sizeof(LN_SUFFIX)) ;
       if (mklinktemp(old, fn, mylink) == -1)
       {
         strerr_warnwu3sys("make a link", " to ", old) ;
diff --git a/src/skaembutils/s6-ls.c b/src/s6-portable-utils/s6-ls.c
index b426da7..b426da7 100644
--- a/src/skaembutils/s6-ls.c
+++ b/src/s6-portable-utils/s6-ls.c
diff --git a/src/skaembutils/s6-maximumtime.c b/src/s6-portable-utils/s6-maximumtime.c
index 4da7e89..4da7e89 100644
--- a/src/skaembutils/s6-maximumtime.c
+++ b/src/s6-portable-utils/s6-maximumtime.c
diff --git a/src/skaembutils/s6-mkdir.c b/src/s6-portable-utils/s6-mkdir.c
index 8212813..8212813 100644
--- a/src/skaembutils/s6-mkdir.c
+++ b/src/s6-portable-utils/s6-mkdir.c
diff --git a/src/skaembutils/s6-mkfifo.c b/src/s6-portable-utils/s6-mkfifo.c
index 37e84af..37e84af 100644
--- a/src/skaembutils/s6-mkfifo.c
+++ b/src/s6-portable-utils/s6-mkfifo.c
diff --git a/src/skaembutils/s6-nice.c b/src/s6-portable-utils/s6-nice.c
index 38017f6..38017f6 100644
--- a/src/skaembutils/s6-nice.c
+++ b/src/s6-portable-utils/s6-nice.c
diff --git a/src/skaembutils/s6-nuke.c b/src/s6-portable-utils/s6-nuke.c
index ff80b6c..ff80b6c 100644
--- a/src/skaembutils/s6-nuke.c
+++ b/src/s6-portable-utils/s6-nuke.c
diff --git a/src/skaembutils/s6-pause.c b/src/s6-portable-utils/s6-pause.c
index e0416ba..e0416ba 100644
--- a/src/skaembutils/s6-pause.c
+++ b/src/s6-portable-utils/s6-pause.c
diff --git a/src/skaembutils/s6-printenv.c b/src/s6-portable-utils/s6-printenv.c
index d1a48de..d1a48de 100644
--- a/src/skaembutils/s6-printenv.c
+++ b/src/s6-portable-utils/s6-printenv.c
diff --git a/src/skaembutils/s6-quote-filter.c b/src/s6-portable-utils/s6-quote-filter.c
index 5ed5b60..5ed5b60 100644
--- a/src/skaembutils/s6-quote-filter.c
+++ b/src/s6-portable-utils/s6-quote-filter.c
diff --git a/src/skaembutils/s6-quote.c b/src/s6-portable-utils/s6-quote.c
index 74c137c..74c137c 100644
--- a/src/skaembutils/s6-quote.c
+++ b/src/s6-portable-utils/s6-quote.c
diff --git a/src/skaembutils/s6-rename.c b/src/s6-portable-utils/s6-rename.c
index a4fc1ee..a4fc1ee 100644
--- a/src/skaembutils/s6-rename.c
+++ b/src/s6-portable-utils/s6-rename.c
diff --git a/src/skaembutils/s6-rmrf.c b/src/s6-portable-utils/s6-rmrf.c
index ebbf9a0..ebbf9a0 100644
--- a/src/skaembutils/s6-rmrf.c
+++ b/src/s6-portable-utils/s6-rmrf.c
diff --git a/src/skaembutils/s6-seq.c b/src/s6-portable-utils/s6-seq.c
index a7b70ba..a7b70ba 100644
--- a/src/skaembutils/s6-seq.c
+++ b/src/s6-portable-utils/s6-seq.c
diff --git a/src/skaembutils/s6-sleep.c b/src/s6-portable-utils/s6-sleep.c
index c5a05b4..c5a05b4 100644
--- a/src/skaembutils/s6-sleep.c
+++ b/src/s6-portable-utils/s6-sleep.c
diff --git a/src/skaembutils/s6-sort.c b/src/s6-portable-utils/s6-sort.c
index 66955fe..66955fe 100644
--- a/src/skaembutils/s6-sort.c
+++ b/src/s6-portable-utils/s6-sort.c
diff --git a/src/skaembutils/s6-sync.c b/src/s6-portable-utils/s6-sync.c
index 34e3e73..34e3e73 100644
--- a/src/skaembutils/s6-sync.c
+++ b/src/s6-portable-utils/s6-sync.c
diff --git a/src/skaembutils/s6-tai64ndiff.c b/src/s6-portable-utils/s6-tai64ndiff.c
index cb35b4e..cb35b4e 100644
--- a/src/skaembutils/s6-tai64ndiff.c
+++ b/src/s6-portable-utils/s6-tai64ndiff.c
diff --git a/src/skaembutils/s6-tail.c b/src/s6-portable-utils/s6-tail.c
index a3091cd..a3091cd 100644
--- a/src/skaembutils/s6-tail.c
+++ b/src/s6-portable-utils/s6-tail.c
diff --git a/src/skaembutils/s6-touch.c b/src/s6-portable-utils/s6-touch.c
index 7c2c156..7c2c156 100644
--- a/src/skaembutils/s6-touch.c
+++ b/src/s6-portable-utils/s6-touch.c
diff --git a/src/skaembutils/s6-true.c b/src/s6-portable-utils/s6-true.c
index f372d43..f372d43 100644
--- a/src/skaembutils/s6-true.c
+++ b/src/s6-portable-utils/s6-true.c
diff --git a/src/skaembutils/s6-uniquename.c b/src/s6-portable-utils/s6-uniquename.c
index 479c50d..479c50d 100644
--- a/src/skaembutils/s6-uniquename.c
+++ b/src/s6-portable-utils/s6-uniquename.c
diff --git a/src/skaembutils/s6-unquote-filter.c b/src/s6-portable-utils/s6-unquote-filter.c
index 4b1b4ef..4b1b4ef 100644
--- a/src/skaembutils/s6-unquote-filter.c
+++ b/src/s6-portable-utils/s6-unquote-filter.c
diff --git a/src/skaembutils/s6-unquote.c b/src/s6-portable-utils/s6-unquote.c
index 34dcea5..34dcea5 100644
--- a/src/skaembutils/s6-unquote.c
+++ b/src/s6-portable-utils/s6-unquote.c
diff --git a/src/skaembutils/s6-update-symlinks.c b/src/s6-portable-utils/s6-update-symlinks.c
index 6b9a145..5ba9156 100644
--- a/src/skaembutils/s6-update-symlinks.c
+++ b/src/s6-portable-utils/s6-update-symlinks.c
@@ -274,27 +274,25 @@ static int updatesymlinks_addlink (stralloc5 *blah, unsigned int dstpos, unsigne
   return MODIFIED ;
 }
 
-int main (int argc, char *const *argv)
+int main (int argc, char const *const *argv)
 {
-  stralloc5 blah = STRALLOC5_ZERO ;
   PROG = "s6-update-symlinks" ;
   if (argc < 3) strerr_dieusage(100, USAGE) ;
   {
-    char *const *p = argv + 1 ;
-    for (; *p ; p++) if (**p != '/') strerr_dieusage(100, USAGE) ;
-  }
-  {
+    stralloc5 blah = STRALLOC5_ZERO ;
+    char const *const *p = argv + 1 ;
     size_t i = strlen(argv[1]) ;
-    while (i && (argv[1][i-1] == '/')) argv[1][--i] = 0 ;
+    char target[i+1] ;
+    for (; *p ; p++) if (**p != '/') strerr_dieusage(100, USAGE) ;
+    p = argv + 2 ;
+    memcpy(target, argv[1], i+1) ;
+    while (i && (target[i-1] == '/')) target[--i] = 0 ;
     if (!i) strerr_diefu1x(100, "replace root directory") ;
-  }
-  if (!updatesymlinks_makeuniquename(&blah.dst, argv[1], UPDATESYMLINKS_MAGICNEW))
-    strerr_diefu2sys(111, "make random unique name based on ", argv[1]) ;
-  if ((unlink(blah.dst.s) == -1) && (errno != ENOENT))
-    strerr_diefu2sys(111, "unlink ", blah.dst.s) ;
+    if (!updatesymlinks_makeuniquename(&blah.dst, target, UPDATESYMLINKS_MAGICNEW))
+      strerr_diefu2sys(111, "make random unique name based on ", target) ;
+    if ((unlink(blah.dst.s) == -1) && (errno != ENOENT))
+      strerr_diefu2sys(111, "unlink ", blah.dst.s) ;
 
-  {
-    char *const *p = argv + 2 ;
     for (; *p ; p++)
     {
       int r ;
@@ -314,35 +312,34 @@ int main (int argc, char *const *argv)
           strerr_dief2sys(111, "error processing ", *p) ;
       }
     }
-  }
-  stralloc_free(&blah.tmp) ;
+    stralloc_free(&blah.tmp) ;
 
-  if (rename(blah.dst.s, argv[1]) == -1) /* be atomic if possible */
-  {
-    blah.src.len = 0 ;
-    if (!updatesymlinks_makeuniquename(&blah.src, argv[1], UPDATESYMLINKS_MAGICOLD))
+    if (rename(blah.dst.s, target) == -1) /* be atomic if possible */
     {
-      updatesymlinks_cleanup(&blah.dst, 0) ;
-      strerr_diefu2sys(111, "make random unique name based on ", argv[1]) ;
-    }
+      blah.src.len = 0 ;
+      if (!updatesymlinks_makeuniquename(&blah.src, target, UPDATESYMLINKS_MAGICOLD))
+      {
+        updatesymlinks_cleanup(&blah.dst, 0) ;
+        strerr_diefu2sys(111, "make random unique name based on ", target) ;
+      }
 
-    if (rename(argv[1], blah.src.s) == -1)
-    {
-      updatesymlinks_cleanup(&blah.dst, 0) ;
-      strerr_diefu4sys(111, "rename ", argv[1], " to ", blah.src.s) ;
-    }
-   /* XXX: unavoidable race condition here: argv[1] does not exist */
-    if (rename(blah.dst.s, argv[1]) == -1)
-    {
-      rename(blah.src.s, argv[1]) ;
-      updatesymlinks_cleanup(&blah.dst, 0) ;
-      strerr_diefu4sys(111, "rename ", blah.dst.s, " to ", argv[1]) ;
+      if (rename(target, blah.src.s) == -1)
+      {
+        updatesymlinks_cleanup(&blah.dst, 0) ;
+        strerr_diefu4sys(111, "rename ", target, " to ", blah.src.s) ;
+      }
+     /* XXX: unavoidable race condition here: target does not exist */
+      if (rename(blah.dst.s, target) == -1)
+      {
+        rename(blah.src.s, target) ;
+        updatesymlinks_cleanup(&blah.dst, 0) ;
+        strerr_diefu4sys(111, "rename ", blah.dst.s, " to ", target) ;
+      }
+      stralloc_free(&blah.dst) ;
+      if (rm_rf_in_tmp(&blah.src, 0) == -1)
+        strerr_warnwu2sys("remove old directory ", blah.src.s) ;
+      stralloc_free(&blah.src) ;
     }
-    stralloc_free(&blah.dst) ;
-    if (rm_rf_in_tmp(&blah.src, 0) == -1)
-      strerr_warnwu2sys("remove old directory ", blah.src.s) ;
-    stralloc_free(&blah.src) ;
   }
-
   return 0 ;
 }
diff --git a/src/skaembutils/seekablepipe.c b/src/s6-portable-utils/seekablepipe.c
index 5ae6a2d..5ae6a2d 100644
--- a/src/skaembutils/seekablepipe.c
+++ b/src/s6-portable-utils/seekablepipe.c
diff --git a/src/skaembutils/deps-exe/s6-ln b/src/skaembutils/deps-exe/s6-ln
deleted file mode 100644
index 720fe7d..0000000
--- a/src/skaembutils/deps-exe/s6-ln
+++ /dev/null
@@ -1,3 +0,0 @@
--lskarnet
-${SOCKET_LIB}
-${SYSCLOCK_LIB}
diff --git a/src/skaembutils/deps-exe/s6-uniquename b/src/skaembutils/deps-exe/s6-uniquename
deleted file mode 100644
index 720fe7d..0000000
--- a/src/skaembutils/deps-exe/s6-uniquename
+++ /dev/null
@@ -1,3 +0,0 @@
--lskarnet
-${SOCKET_LIB}
-${SYSCLOCK_LIB}
diff --git a/src/skaembutils/deps-exe/s6-update-symlinks b/src/skaembutils/deps-exe/s6-update-symlinks
deleted file mode 100644
index 720fe7d..0000000
--- a/src/skaembutils/deps-exe/s6-update-symlinks
+++ /dev/null
@@ -1,3 +0,0 @@
--lskarnet
-${SOCKET_LIB}
-${SYSCLOCK_LIB}