1 files changed, 3 insertions, 42 deletions

diff --git a/src/libs6rc/s6rc_repo_listsub.c b/src/libs6rc/s6rc_repo_listsub.c
index eef0a7c..eed5cb4 100644
--- a/src/libs6rc/s6rc_repo_listsub.c
+++ b/src/libs6rc/s6rc_repo_listsub.c
@@ -1,59 +1,20 @@
 /* ISC license. */
 
 #include <string.h>
-#include <errno.h>
-
-#include <skalibs/direntry.h>
-#include <skalibs/strerr.h>
-#include <skalibs/stralloc.h>
-#include <skalibs/genalloc.h>
 
+#include <s6-rc/s6rc-utils.h>
 #include <s6-rc/repo.h>
 
 int s6rc_repo_listsub (char const *repo, char const *set, char const *sub, stralloc *sa, genalloc *ga)
 {
-  size_t sabase = sa->len ;
-  size_t gabase = genalloc_len(size_t, ga) ;
   size_t repolen = strlen(repo) ;
   size_t setlen = strlen(set) ;
   size_t sublen = strlen(sub) ;
-  int sawasnull = !sa->s ;
-  int gawasnull = !genalloc_s(size_t, ga) ;
-  int n = 0 ;
   char fn[repolen + setlen + 10 + sublen] ;
   memcpy(fn, repo, repolen) ;
   memcpy(fn + repolen, "/sources/", 9) ;
   memcpy(fn + repolen + 9, set, setlen) ;
-  memcpy(fn + repolen + 9 + setlen, sub, sublen) ;
-
-  DIR *dir = opendir(fn) ;
-  if (!dir)
-  {
-    strerr_warnfu2sys("opendir ", fn) ;
-    return -1 ;
-  }
-  for (;;)
-  {
-    direntry *d ;
-    size_t len ;
-    errno = 0 ;
-    d = readdir(dir) ;
-    if (!d) break ;
-    if (d->d_name[0] == '.') continue ;
-    len = strlen(d->d_name) ;
-    if (!genalloc_catb(size_t, ga, &sa->len, 1)) goto err ;
-    if (!stralloc_catb(sa, d->d_name, len+1)) goto err ;
-    n++ ;
-  }
-  if (errno) goto err ;
-  dir_close(dir) ;
-  return n ;
+  memcpy(fn + repolen + 9 + setlen, sub, sublen + 1) ;
 
- err:
-  dir_close(dir) ;
-  if (gawasnull) genalloc_free(size_t, ga) ;
-  else genalloc_setlen(size_t, ga, gabase) ;
-  if (sawasnull) stralloc_free(sa) ;
-  else sa->len = sabase ;
-  return -1 ;
+  return s6rc_ls(fn, sa, ga) ;
 }