rename parser.h header file to parse.h

src/include/66/66.h

@@ -22,7 +22,7 @@
 #include <66/graph.h>
 #include <66/hpr.h>
 #include <66/info.h>
-#include <66/parser.h>
+#include <66/parse.h>
 #include <66/resolve.h>
 #include <66/sanitize.h>
 #include <66/service.h>

src/include/66/environ.h

@@ -20,7 +20,7 @@
 
 #include <skalibs/stralloc.h>
 
-#include <66/parser.h>
+#include <66/parse.h>
 #include <66/service.h>
 
 extern int env_resolve_conf(stralloc *env,char const *svname,uid_t owner) ;

src/include/66/parser.h → src/include/66/parse.h

 /*
- * parser.h
+ * parse.h
  *
  * Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org>
  *
@@ -12,8 +12,8 @@
  * except according to the terms contained in the LICENSE file./
  */
 
-#ifndef SS_PARSER_H
-#define SS_PARSER_H
+#ifndef SS_PARSE_H
+#define SS_PARSE_H
 
 #include <sys/types.h>
 #include <stdint.h>
@@ -47,8 +47,8 @@ extern void ssexec_enable_cleanup(void) ;
 extern void start_parser(char const *sv, ssexec_t *info, uint8_t disable_module, char const *directory_forced) ;
 
 extern void parse_service(char const *sv, ssexec_t *info, uint8_t force, uint8_t conf) ;
-extern int parse_frontend(char const *sv, resolve_service_t *ares, unsigned int *areslen, ssexec_t *info, uint8_t force, uint8_t conf, unsigned int *residx, char const *forced_directory, char const *main) ;
-extern int parse_dependencies(resolve_service_t *res, resolve_service_t *ares, unsigned int *areslen, ssexec_t *info, uint8_t force,uint8_t conf, char const *forced_directory, char const *main, uint8_t requiredby) ;
+extern int parse_frontend(char const *sv, resolve_service_t *ares, unsigned int *areslen, ssexec_t *info, uint8_t force, uint8_t conf, char const *forced_directory, char const *main, char const *inmodule) ;
+extern int parse_interdependences(char const *service, char const *list, unsigned int listlen, resolve_service_t *ares, unsigned int *areslen, ssexec_t *info, uint8_t force, uint8_t conf, char const *forced_directory, char const *main, char const *inmodule) ;
 
 /** split */
 extern int parse_section(stralloc *secname, char const *str, size_t *pos) ;
@@ -78,6 +78,6 @@ extern void parse_error(int ierr, int idsec, int idkey) ;
 extern void parse_module(resolve_service_t *res, resolve_service_t *ares, unsigned int *areslen, ssexec_t *info, uint8_t force) ;
 
 /** resolve */
-extern void parse_compute_resolve(resolve_service_t *res, ssexec_t *info) ;
+extern void parse_compute_resolve(unsigned int idx, resolve_service_t *ares, unsigned int *areslen, ssexec_t *info) ;
 
 #endif

src/lib66/environ/env_compute.c

@@ -22,7 +22,7 @@
 
 #include <66/environ.h>
 #include <66/service.h>
-#include <66/parser.h>
+#include <66/parse.h>
 
 
 int env_compute(stralloc *result, resolve_service_t *res)

src/lib66/environ/env_make_symlink.c

@@ -21,7 +21,7 @@
 #include <skalibs/unix-transactional.h>//atomic_symlink
 
 #include <66/environ.h>
-#include <66/parser.h>
+#include <66/parse.h>
 #include <66/constants.h>
 #include <66/service.h>
 

src/lib66/environ/env_prepare_for_write.c

@@ -24,7 +24,7 @@
 #include <66/environ.h>
 #include <66/constants.h>
 #include <66/service.h>
-#include <66/parser.h>
+#include <66/parse.h>
 
 int env_prepare_for_write(stralloc *dst, stralloc *contents, resolve_service_t *res)
 {

src/lib66/exec/ssexec_parse.c

@@ -23,7 +23,7 @@
 #include <oblibs/obgetopt.h>
 #include <oblibs/sastr.h>
 
-#include <66/parser.h>
+#include <66/parse.h>
 #include <66/ssexec.h>
 #include <66/utils.h>
 #include <66/sanitize.h>

src/lib66/parse/parse_clean_runas.c

@@ -22,7 +22,7 @@
 
 #include <skalibs/types.h>
 
-#include <66/parser.h>
+#include <66/parse.h>
 #include <66/utils.h>
 
 int parse_clean_runas(char const *str, int idsec, int idkey)

src/lib66/parse/parse_compute_list.c

@@ -22,7 +22,7 @@
 
 #include <skalibs/stralloc.h>
 
-#include <66/parser.h>
+#include <66/parse.h>
 #include <66/resolve.h>
 #include <66/service.h>
 
@@ -34,26 +34,23 @@ int parse_compute_list(resolve_wrapper_t_ref wres, stralloc *sa, uint32_t *res,
     int r, found = 0 ;
     size_t len = sa->len, pos = 0 ;
     size_t nelement = sastr_nelement(sa) ;
-    char t[len + nelement + 2] ;
+    stralloc tmp = STRALLOC_ZERO ;
     char f[len + nelement + 2] ;
 
     memset(f, 0, len) ;
-    memset(t, 0, len) ;
 
-    sastr_to_char(t, sa) ;
+    for (; pos < sa->len ; pos += strlen(sa->s + pos) + 1) {
 
-    for (; pos < len ; pos += strlen(t + pos) + 1) {
-
-        if (t[pos] == '#')
+        if (sa->s[pos] == '#')
             continue ;
 
         if (opts) {
 
-            sa->len = 0 ;
+            tmp.len = 0 ;
 
-            r = service_frontend_path(sa, t + pos, getuid(), 0) ;
+            r = service_frontend_path(&tmp, sa->s + pos, getuid(), 0) ;
             if (r == -1)
-                log_dieu(LOG_EXIT_SYS, "get frontend service file of: ", t + pos) ;
+                log_dieu(LOG_EXIT_SYS, "get frontend service file of: ", sa->s + pos) ;
 
             if (!r)
                 continue ;
@@ -62,7 +59,7 @@ int parse_compute_list(resolve_wrapper_t_ref wres, stralloc *sa, uint32_t *res,
 
         }
 
-        auto_strings(f + strlen(f), t + pos, " ") ;
+        auto_strings(f + strlen(f), sa->s + pos, " ") ;
 
         (*res)++ ;
 
@@ -72,6 +69,8 @@ int parse_compute_list(resolve_wrapper_t_ref wres, stralloc *sa, uint32_t *res,
 
     f[strlen(f) - 1] = 0 ;
 
+    stralloc_free(&tmp) ;
+
     return resolve_add_string(wres, f) ;
 
 }

src/lib66/parse/parse_contents.c

@@ -19,7 +19,7 @@
 
 #include <skalibs/stralloc.h>
 
-#include <66/parser.h>
+#include <66/parse.h>
 #include <66/resolve.h>
 #include <66/enum.h>
 

src/lib66/parse/parse_line_g.c

@@ -19,7 +19,7 @@
 
 #include <skalibs/stralloc.h>
 
-#include <66/parser.h>
+#include <66/parse.h>
 
 /* @Return 2 if bad format */
 int parse_line_g(char *store, parse_mill_t *config, char const *str, size_t *pos)

src/lib66/parse/parse_mandatory.c

@@ -14,7 +14,7 @@
 
 #include <oblibs/log.h>
 
-#include <66/parser.h>
+#include <66/parse.h>
 #include <66/resolve.h>
 #include <66/enum.h>
 

src/lib66/parse/parse_parentheses.c

@@ -17,7 +17,7 @@
 
 #include <oblibs/string.h>
 
-#include <66/parser.h>
+#include <66/parse.h>
 
 static char parse_char_next(char const *s, size_t *pos)
 {

src/lib66/parse/parse_section.c

@@ -20,7 +20,7 @@
 
 #include <skalibs/stralloc.h>
 
-#include <66/parser.h>
+#include <66/parse.h>
 #include <66/enum.h>
 
 int parse_section(stralloc *secname, char const *str, size_t *pos)

src/lib66/parse/parse_split_from_section.c

@@ -23,7 +23,7 @@
 #include <skalibs/stralloc.h>
 #include <skalibs/types.h> //UINT_FMT
 
-#include <66/parser.h>
+#include <66/parse.h>
 #include <66/resolve.h>
 #include <66/enum.h>
 

src/lib66/parse/parse_store_environ.c

@@ -19,7 +19,7 @@
 
 #include <skalibs/stralloc.h>
 
-#include <66/parser.h>
+#include <66/parse.h>
 #include <66/resolve.h>
 #include <66/enum.h>
 #include <66/utils.h>

src/lib66/parse/parse_store_g.c

@@ -14,7 +14,7 @@
 
 #include <oblibs/log.h>
 
-#include <66/parser.h>
+#include <66/parse.h>
 #include <66/resolve.h>
 #include <66/enum.h>
 

src/lib66/parse/parse_store_logger.c

@@ -18,7 +18,7 @@
 
 #include <skalibs/types.h>
 
-#include <66/parser.h>
+#include <66/parse.h>
 #include <66/resolve.h>
 #include <66/service.h>
 #include <66/enum.h>

src/lib66/parse/parse_store_regex.c

@@ -19,7 +19,7 @@
 
 #include <skalibs/stralloc.h>
 
-#include <66/parser.h>
+#include <66/parse.h>
 #include <66/resolve.h>
 #include <66/enum.h>
 
@@ -27,7 +27,7 @@ int parse_store_regex(resolve_service_t *res, char *store, int idsec, int idkey)
 {
     log_flow() ;
 
-    if (res->type == TYPE_CLASSIC || res->type == TYPE_ONESHOT)
+    if (res->type != TYPE_MODULE)
         return 1 ;
 
     stralloc sa = STRALLOC_ZERO ;

src/lib66/parse/parse_store_start_stop.c

@@ -18,7 +18,7 @@
 
 #include <skalibs/stralloc.h>
 
-#include <66/parser.h>
+#include <66/parse.h>
 #include <66/resolve.h>
 #include <66/service.h>
 #include <66/enum.h>