Implement badsub, refactor moveservices, get ready for enable/disable

1 files changed, 22 insertions, 25 deletions

diff --git a/src/libs6rc/s6rc_repo_moveservices.c b/src/libs6rc/s6rc_repo_moveservices.c
index 8177fe7..fb4bf9f 100644
--- a/src/libs6rc/s6rc_repo_moveservices.c
+++ b/src/libs6rc/s6rc_repo_moveservices.c
@@ -9,53 +9,50 @@
 
 #include <s6-rc/repo.h>
 
-int s6rc_repo_moveservices (char const *repo, char const *set, char const *const *services, size_t n, char const *fromsub, char const *tosub, unsigned int verbosity)
+int s6rc_repo_moveservices (char const *repo, char const *set, char const *const *services, size_t n, uint8_t oldsub, uint8_t newsub, unsigned int verbosity)
 {
   size_t repolen = strlen(repo) ;
   size_t setlen = strlen(set) ;
-  size_t fromsublen = strlen(fromsub) ;
-  size_t tosublen = strlen(tosub) ;
   size_t maxserviceslen = 0 ;
-  size_t i = 0 ;
-  for (; i < n ; i++)
+  for (size_t i = 0 ; i < n ; i++)
   {
     size_t len = strlen(services[i]) ;
     if (len > maxserviceslen) maxserviceslen = len ;
   }
-  char from[repolen + setlen + fromsublen + maxserviceslen + 12] ;
-  char to[repolen + setlen + tosublen + maxserviceslen + 12] ;
-  memcpy(from, repo, repolen) ;
-  memcpy(from + repolen, "/sources/", 9) ;
-  memcpy(from + repolen + 9, set, setlen) ;
-  from[repolen + 9 + setlen] = '/' ;
-  memcpy(to, from, repolen + 10 + setlen) ;
-  memcpy(from + repolen + 10 + setlen, fromsub, fromsublen) ;
-  from[repolen + 10 + setlen + fromsublen] = '/' ;
-  memcpy(to + repolen + 10 + setlen, tosub, tosublen) ;
-  to[repolen + 10 + setlen + tosublen] = '/' ;
-  for (i = 0 ; i < n ; i++)
+  char oldfn[repolen + setlen + maxserviceslen + 18] ;
+  char newfn[repolen + setlen + maxserviceslen + 18] ;
+  memcpy(oldfn, repo, repolen) ;
+  memcpy(oldfn + repolen, "/sources/", 9) ;
+  memcpy(oldfn + repolen + 9, set, setlen) ;
+  oldfn[repolen + 9 + setlen] = '/' ;
+  memcpy(oldfn + repolen + 10 + setlen, s6rc_repo_subnames[oldsub], 6) ;
+  oldfn[repolen + 16 + setlen] = '/' ;
+  memcpy(newfn, oldfn, repolen + 17 + setlen) ;
+  memcpy(newfn + repolen + 10 + setlen, s6rc_repo_subnames[newsub], 6) ;
+
+  for (size_t i = 0 ; i < n ; i++)
   {
     size_t len = strlen(services[i]) ;
-    memcpy(from + repolen + setlen + fromsublen + 11, services[i], len + 1) ;
-    memcpy(to + repolen + setlen + tosublen + 11, services[i], len + 1) ;
-    if (access(to, F_OK) == 0)
+    memcpy(oldfn + repolen + setlen + 17, services[i], len + 1) ;
+    memcpy(newfn + repolen + setlen + 17, services[i], len + 1) ;
+    if (access(newfn, F_OK) == 0)
     {
       if (verbosity >= 2)
-        strerr_warni8x("service ", services[i], " already existed in subset ", tosub, " of set ", set, " in repository ", repo) ;
+        strerr_warni8x("service ", services[i], " already existed in subset ", s6rc_repo_subnames[newsub], " of set ", set, " in repository ", repo) ;
     }
     else if (errno != ENOENT)
     {
-      strerr_warnfu2sys("access ", to) ;
+      strerr_warnfu2sys("access ", newfn) ;
       return 0 ;
     }
-    if (rename(from, to) == -1)
+    if (rename(oldfn, newfn) == -1)
     {
-      strerr_warnfu4sys("rename ", from, " to ", to) ;
+      strerr_warnfu4sys("rename ", oldfn, " to ", newfn) ;
       return 0 ;
     }
     if (verbosity >= 3)
     {
-      strerr_warnt10x("repository ", repo, ", set ", set, ", from subset ", fromsub, " to subset ", tosub, ": successfully moved service ", services[i]) ;
+      strerr_warnt10x("repository ", repo, ", set ", set, ", from subset ", s6rc_repo_subnames[oldsub], " to subset ", s6rc_repo_subnames[newsub], ": successfully moved service ", services[i]) ;
     }
   }
   return 1 ;