Better cdb management; deps_wanted_closure mostly done

Signed-off-by: Laurent Bercot <ska@appnovation.com>

1 files changed, 10 insertions, 7 deletions

diff --git a/src/libs6rc/s6rc_service_resolve.c b/src/libs6rc/s6rc_service_resolve.c
index 52caae7..6868e6b 100644
--- a/src/libs6rc/s6rc_service_resolve.c
+++ b/src/libs6rc/s6rc_service_resolve.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <string.h>
-#include <errno.h>
 
 #include <skalibs/uint32.h>
 #include <skalibs/bytestr.h>
@@ -9,22 +8,26 @@
 
 #include <s6-rc/db.h>
 
-int s6rc_service_resolve (cdb_t *c, char const *s, uint32_t *id, char const **param)
+int s6rc_service_resolve (s6rc_db_t const *db, char const *s, uint32_t *id, char const **param)
 {
   size_t len = strlen(s) ;
   char const *p = 0 ;
-  int r = cdb_find(c, s, len) ;
+  cdb_reader reader = CDB_READER_ZERO ;
+  cdb_data data ;
+  int r = cdb_find(c, &reader, &data, s, len) ;
   if (r < 0) return r ;
-  if (!r)
+  else if (!r)
   {
     size_t at = byte_chr(s, len, '@') ;
     if (at == len) return 0 ;
-    if (at == len - 1) return (errno = EINVAL, -1) ;
-    r = cdb_find(c, s, at + 1) ;
+    if (at == len - 1) return -1 ;
+    cdb_findstart(&reader) ;
+    r = cdb_find(c, &reader, &data, s, at + 1) ;
     if (r <= 0) return r ;
     p = s + at + 1 ;
   }
-  uint32_unpack_big(cdb_datapos(c), id) ;
+  if (data.len != 4) return -1 ;
+  uint32_unpack_big(data.s, id) ;
   *param = p ;
   return 1 ;
 }