Working repo fix that understands pipelines

1 files changed, 17 insertions, 18 deletions

diff --git a/src/repo/s6rc_repo_fixset.c b/src/repo/s6rc_repo_fixset.c
index 45cc36e..d0252a0 100644
--- a/src/repo/s6rc_repo_fixset.c
+++ b/src/repo/s6rc_repo_fixset.c
@@ -11,65 +11,66 @@
 
 #include <s6-rc/repo.h>
 
-static inline int s6rc_repo_fixsub (char const *repo, char const *set, uint8_t sub, s6rc_repo_sv *byname, char const **bysub, uint32_t ntot, uint32_t options, uint32_t const *subind, uint32_t const *subn, unsigned int verbosity, stralloc *sa, genalloc *badga)
+static inline int s6rc_repo_fixsub (char const *repo, char const *set, uint8_t sub, s6rc_repo_sv *byname, char const **bysub, uint32_t ntot, uint32_t options, uint32_t const *subind, uint32_t const *subn, unsigned int verbosity, stralloc *sa, genalloc *badga, genalloc *gatmp)
 {
   size_t sabase = sa->len ;
-  uint32_t gabase = genalloc_len(uint32_t, badga) ;
   uint32_t const *bads ;
   uint32_t badn ;
   int e = 0 ;
-  if (!s6rc_repo_badsub(repo, set, bysub + subind[sub], subn[sub], sub, options & 1 ? 2 : 1, byname, ntot, sa, badga)) return 111 ;
+  if (!s6rc_repo_badsub(repo, set, bysub + subind[sub], subn[sub], sub, options & 1 ? 2 : 1, byname, ntot, sa, badga, gatmp)) return 111 ;
   bads = genalloc_s(uint32_t, badga) ;
   badn = genalloc_len(uint32_t, badga) ;
   if (!badn) return 0 ;
+  if (options & 8) return 1 ;
 
   s6rc_repo_sv tomove[badn] ;
   for (uint32_t j = 0 ; j < badn ; j++)
   {
     tomove[j] = byname[bads[j]] ;
     if (verbosity >= 2)
-      strerr_warni(options & 4 ? "(dry run) " : "", "in set ", set, " of repository ", repo, ": ", options & 1 ? "up" : "down", "fix service ", sa->s + tomove[j].pos, " from ", s6rc_repo_subnames[tomove[j].sub], " to ", s6rc_repo_subnames[sub]) ;
-    if (tomove[j].sub == 0 && verbosity)
-      strerr_warnw(options & 4 ? "(dry run) " : "", "service ", sa->s + tomove[j].pos, " will automatically be unmasked by an upfix to ", s6rc_repo_subnames[sub]) ;
+      strerr_warni(options & 4 ? "(dry run) " : "", "in set ", set, " of repository ", repo, ": ", "moving service ", sa->s + tomove[j].pos, " from ", s6rc_repo_subnames[tomove[j].sub], " to ", s6rc_repo_subnames[sub]) ;
+    else if (tomove[j].sub == 0 && verbosity)
+      strerr_warnw(options & 4 ? "(dry run) " : "", "service ", sa->s + tomove[j].pos, " will be unmasked by an upfix to ", s6rc_repo_subnames[sub]) ;
+    else if (sub == 0 && verbosity)
+      strerr_warnw(options & 4 ? "(dry run) " : "", "service ", sa->s + tomove[j].pos, " will be masked by a downfix to ", s6rc_repo_subnames[sub]) ;
     if (tomove[j].sub == 3)
     {
       if (!(options & 2))
       {
         if (options & 4)
-          strerr_warnw(options & 4 ? "(dry run) " : "", "in set ", set, " of repository ", repo, ": service ", sa->s + tomove[j].pos, " is marked as essential and cannot be downfixed (--no-force-essential") ;
+          strerr_warnw(options & 4 ? "(dry run) " : "", "in set ", set, " of repository ", repo, ": service ", sa->s + tomove[j].pos, " is marked as essential and cannot be downfixed (--no-force-essential)") ;
         else
         {
-          strerr_warnf(options & 4 ? "(dry run) " : "", "in set ", set, " of repository ", repo, ": service ", sa->s + tomove[j].pos, " is marked as essential and cannot be downfixed (--no-force-essential") ;
+          strerr_warnf(options & 4 ? "(dry run) " : "", "in set ", set, " of repository ", repo, ": service ", sa->s + tomove[j].pos, " is marked as essential and cannot be downfixed (--no-force-essential)") ;
           e = 1 ;
           goto err ;
         }
       }
       else if (verbosity)
-      strerr_warnw(options & 4 ? "(dry run) " : "", "service ", sa->s + tomove[j].pos, " will automatically be marked non-essential by a downfix to ", s6rc_repo_subnames[sub]) ;
+        strerr_warnw(options & 4 ? "(dry run) " : "", "service ", sa->s + tomove[j].pos, " will automatically be marked non-essential by a downfix to ", s6rc_repo_subnames[sub]) ;
     }
   }
   if (!(options & 4))
   {
     if (!s6rc_repo_moveservices(repo, set, tomove, badn, sub, sa->s, verbosity)) { e = 111 ; goto err ; }
-    for (uint32_t j = 0 ; j < badn ; j++) byname[bads[j]].sub = sub ;
   }
+  for (uint32_t j = 0 ; j < badn ; j++) byname[bads[j]].sub = sub ;
 
  err:
-  genalloc_setlen(uint32_t, badga, gabase) ;
+  genalloc_setlen(uint32_t, badga, 0) ;
   sa->len = sabase ;
   return e ;
 }
 
-int s6rc_repo_fixset (char const *repo, char const *set, uint32_t options, unsigned int verbosity, stralloc *sa, genalloc *svlist, genalloc *badga)
+int s6rc_repo_fixset (char const *repo, char const *set, uint32_t options, unsigned int verbosity, stralloc *sa, genalloc *svlist, genalloc *badga, genalloc *gatmp)
 {
   int e = 0 ;
   size_t sabase = sa->len ;
-  uint32_t svbase = genalloc_len(s6rc_repo_sv, svlist) ;
-  uint32_t gabase = genalloc_len(uint32_t, badga) ;
   uint32_t ntot ;
   uint32_t subind[4] ;
   uint32_t sublen[4] ;
   s6rc_repo_sv *byname ;
+  genalloc_setlen(s6rc_repo_sv, svlist, 0) ;
   if (!s6rc_repo_makesvlist(repo, set, sa, svlist, subind)) return 0 ;
   byname = genalloc_s(s6rc_repo_sv, svlist) ;
   ntot = genalloc_len(s6rc_repo_sv, svlist) ;
@@ -84,12 +85,10 @@ int s6rc_repo_fixset (char const *repo, char const *set, uint32_t options, unsig
 
   for (uint8_t sub = 0 ; sub < 4 ; sub++) if (sublen[sub])
   {
-    e = s6rc_repo_fixsub(repo, set, sub, byname, bysub, ntot, options, subind, sublen, verbosity, sa, badga) ;
+    e = s6rc_repo_fixsub(repo, set, sub, byname, bysub, ntot, options, subind, sublen, verbosity, sa, badga, gatmp) ;
     if (e) break ;
   }
 
-  genalloc_setlen(uint32_t, badga, gabase) ;
-  genalloc_setlen(s6rc_repo_sv, svlist, svbase) ;
-  sa->len = sabase ;
+  genalloc_setlen(s6rc_repo_sv, svlist, 0) ;
   return e ;
 }