7 files changed, 14 insertions, 21 deletions
diff --git a/src/include/s6-rc/s6rc-utils.h b/src/include/s6-rc/s6rc-utils.h
index e1533dc..7da49ee 100644
--- a/src/include/s6-rc/s6rc-utils.h
+++ b/src/include/s6-rc/s6rc-utils.h
@@ -12,8 +12,6 @@
 
 #include <s6-rc/s6rc-db.h>
 
-extern int s6rc_strrefcmp (void const *, void const *) ;
-
 extern void s6rc_graph_closure (s6rc_db_t const *, unsigned char *, unsigned int, int) ;
 extern int s6rc_lock (char const *, int, int *, char const *, int, int *, int) ;
 extern int s6rc_read_uint (char const *, unsigned int *) ;
diff --git a/src/libs6rc/deps-lib/s6rc b/src/libs6rc/deps-lib/s6rc
index 02797a8..ea3c4fd 100644
--- a/src/libs6rc/deps-lib/s6rc
+++ b/src/libs6rc/deps-lib/s6rc
@@ -54,7 +54,6 @@ s6rc_servicedir_copy_offline.o
 s6rc_servicedir_copy_online.o
 s6rc_servicedir_manage.o
 s6rc_servicedir_unsupervise.o
-s6rc_strrefcmp.o
 s6rc_type_check.o
 -ls6
 -lskarnet
diff --git a/src/libs6rc/s6rc_repo_fillset.c b/src/libs6rc/s6rc_repo_fillset.c
index 2332e3c..1b2e2b6 100644
--- a/src/libs6rc/s6rc_repo_fillset.c
+++ b/src/libs6rc/s6rc_repo_fillset.c
@@ -5,10 +5,10 @@
 #include <stdlib.h>
 #include <errno.h>
 
+#include <skalibs/bytestr.h>
 #include <skalibs/direntry.h>
 #include <skalibs/strerr.h>
 
-#include <s6-rc/s6rc-utils.h>
 #include <s6-rc/repo.h>
 
 int s6rc_repo_fillset (char const *repo, char const *set, char const *const *existing, uint32_t n)
@@ -45,7 +45,7 @@ int s6rc_repo_fillset (char const *repo, char const *set, char const *const *exi
     char dst[repolen + 18 + setlen + len] ;
     memcpy(src, "../.atomics/", 12) ;
     memcpy(src + 12, d->d_name, len+1) ;
-    if (n && bsearch(&d->d_name, existing, n, sizeof(char const *), &s6rc_strrefcmp)) continue ;
+    if (n && bsearch(d->d_name, existing, n, sizeof(char const *), &str_bcmp)) continue ;
     memcpy(src + 12 + len, "/flag-essential", 16) ;
     if (access(src, F_OK) == 0) subi = 3 ;
     else
diff --git a/src/libs6rc/s6rc_repo_makesetbundles.c b/src/libs6rc/s6rc_repo_makesetbundles.c
index 12d76b8..81267b9 100644
--- a/src/libs6rc/s6rc_repo_makesetbundles.c
+++ b/src/libs6rc/s6rc_repo_makesetbundles.c
@@ -9,12 +9,12 @@
 
 #include <skalibs/stat.h>
 #include <skalibs/direntry.h>
+#include <skalibs/bytestr.h>
 #include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/djbunix.h>
 
-#include <s6-rc/s6rc-utils.h>
 #include <s6-rc/repo.h>
 
 int s6rc_repo_makesetbundles (char const *repo, char const *set, unsigned int verbosity)
@@ -49,7 +49,7 @@ int s6rc_repo_makesetbundles (char const *repo, char const *set, unsigned int ve
     for (size_t i = 0 ; i < n ; i++) masked[i] = maskedstorage + genalloc_s(size_t, &ga)[i] ;
     sa.len = 0 ;
     genalloc_setlen(size_t, &ga, 0) ;
-    qsort(masked, n, sizeof(char const *), &s6rc_strrefcmp) ;
+    qsort(masked, n, sizeof(char const *), &str_cmp) ;
 
     if (mkdir(dst, 02755) == -1)
     {
@@ -83,7 +83,7 @@ int s6rc_repo_makesetbundles (char const *repo, char const *set, unsigned int ve
       for (; i < m ; i++)
       {
         char const *x = sa.s + genalloc_s(size_t, &ga)[i] ;
-        if (bsearch(x, masked, n, sizeof(char const *), &s6rc_strrefcmp))
+        if (bsearch(x, masked, n, sizeof(char const *), &str_bcmp))
         {
           if (verbosity >= 3)
             strerr_warni4x("skipping bundle ", d->d_name, " containing e.g. masked service ", x) ;
diff --git a/src/libs6rc/s6rc_repo_subnames.c b/src/libs6rc/s6rc_repo_subnames.c
index a60f4e8..2653f01 100644
--- a/src/libs6rc/s6rc_repo_subnames.c
+++ b/src/libs6rc/s6rc_repo_subnames.c
@@ -2,4 +2,4 @@
 
 #include <s6-rc/repo.h>
 
-char const s6rc_repo_subnames[4][7] = { "masked", "active", "onboot", "always" } ;
+char const s6rc_repo_subnames[4][7] = { "masked", "usable", "active", "always" } ;
diff --git a/src/libs6rc/s6rc_strrefcmp.c b/src/libs6rc/s6rc_strrefcmp.c
deleted file mode 100644
index e4732df..0000000
--- a/src/libs6rc/s6rc_strrefcmp.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* ISC license. */
-
-#include <string.h>
-
-#include <s6-rc/s6rc-utils.h>
-
-int s6rc_strrefcmp (void const *a, void const *b)
-{
-  return strcmp(*(char const *const *)a, *(char const *const *)b) ;
-}
diff --git a/src/repo/s6-rc-set-change.c b/src/repo/s6-rc-set-change.c
index c659471..188b11c 100644
--- a/src/repo/s6-rc-set-change.c
+++ b/src/repo/s6-rc-set-change.c
@@ -66,19 +66,25 @@ static uint64_t wgolb = 0 ;
 
 static struct subname_s const accepted_subs[] =
 {
-  { .name = "active", .sub = 1 },
+  { .name = "activate", .sub = 2 },
+  { .name = "active", .sub = 2 },
   { .name = "always", .sub = 3 },
+  { .name = "deactivate", .sub = 1 },
   { .name = "disable", .sub = 1 },
   { .name = "disabled", .sub = 1 },
   { .name = "enable", .sub = 2 },
   { .name = "enabled", .sub = 2 },
   { .name = "essential", .sub = 3 },
+  { .name = "inactive", .sub = 1 },
+  { .name = "latent", .sub = 1 },
   { .name = "make-essential", .sub = 3 },
   { .name = "mask", .sub = 0 },
   { .name = "masked", .sub = 0 },
   { .name = "onboot", .sub = 2 },
+  { .name = "suppress", .sub = 0 },
   { .name = "unmask", .sub = 1 },
-  { .name = "unmasked", .sub = 1 }
+  { .name = "unmasked", .sub = 1 },
+  { .name = "usable", .sub = 1 }
 } ;
 
 static int subname_cmp (void const *a, void const *b)