diff --git a/src/include/66/enum.h b/src/include/66/enum.h
index 022cd2d76a49d57f5d6bfab9069b8272e323c572..a1bbbf71cb62c85d04fdc25e83749f0a32dd3898 100644
--- a/src/include/66/enum.h
+++ b/src/include/66/enum.h
@@ -33,6 +33,7 @@ enum key_enum_e
DESCRIPTION ,
CONTENTS ,
DEPENDS ,
+ OPTSDEPS ,
OPTIONS ,
NOTIFY ,
USER ,
@@ -120,6 +121,7 @@ static key_description_t const main_section_list[] =
{ .name = "@name", .expected = LINE, .mandatory = OPTS },
{ .name = "@description", .expected = QUOTE, .mandatory = OPTS },
{ .name = "@depends", .expected = BRACKET, .mandatory = OPTS },
+ { .name = "@optsdepends", .expected = BRACKET, .mandatory = OPTS },
{ .name = "@contents", .expected = BRACKET, .mandatory = BUNDLE },
{ .name = "@options", .expected = BRACKET, .mandatory = OPTS },
{ .name = "@flags", .expected = BRACKET, .mandatory = OPTS },
@@ -166,7 +168,7 @@ static key_description_t const environment_section_list[] =
{ .name = 0 }
} ;
-static int const total_list_el[6] = { 17, 5, 5, 12, 2, 0 } ;
+static int const total_list_el[6] = { 18, 5, 5, 12, 2, 0 } ;
static key_all_t const total_list[] =
{
diff --git a/src/include/66/parser.h b/src/include/66/parser.h
index d7c33ca2f389ad152de99a439c9d2fdb6c966851..494828a3c80a8b131abda65f3859cfb9d810b0c9 100644
--- a/src/include/66/parser.h
+++ b/src/include/66/parser.h
@@ -104,8 +104,10 @@ struct sv_name_s
int itype ;/**int type =30->classic,31->bundle,32->longrun,33->oneshot*/
int name ;//pos in keep
unsigned int description ;//pos in keep
- unsigned int idga ; //pos in genalloc gadeps
- unsigned int nga ; //len of idga in genalloc gadeps
+ unsigned int idga ; //pos in genalloc gadeps-> depends field
+ unsigned int nga ; //number or deps in genalloc gadeps->depends field
+ unsigned int idopts ;// pos in genalloc gadeps -> optional depends
+ unsigned int nopts ; // number of optinal depends in genalloc gadeps->optional depends
unsigned int logname ; //pos in keep
unsigned int dstlog ; //pos in keep
} ;
@@ -253,8 +255,9 @@ extern void freed_parser(void) ;
/** enable phase */
extern int parser(sv_alltype *service,stralloc *src,char const *svname) ;
extern int parse_service_check_enabled(ssexec_t *info, char const *svname,uint8_t force,uint8_t *exist) ;
-extern int parse_service_before(ssexec_t *info, stralloc *parsed_list, char const *sv,unsigned int *nbsv, stralloc *sasv,uint8_t force,uint8_t *exist) ;
-extern int parse_service_deps(ssexec_t *info,stralloc *parsed_list, sv_alltype *sv_before, char const *sv,unsigned int *nbsv,stralloc *sasv,uint8_t force) ;
+extern int parse_service_before(ssexec_t *info, stralloc *parsed_list, stralloc *opts_deps_list, char const *sv,unsigned int *nbsv, stralloc *sasv,uint8_t force,uint8_t *exist) ;
+extern int parse_service_deps(ssexec_t *info,stralloc *parsed_list, stralloc *opts_deps_list, sv_alltype *sv_before, char const *sv,unsigned int *nbsv,stralloc *sasv,uint8_t force) ;
+extern int parse_service_opts_deps(ssexec_t *info,stralloc *parsed_list,stralloc *opts_deps_list,sv_alltype *sv_before,char const *sv,unsigned int *nbsv,stralloc *sasv,uint8_t force) ;
extern int parse_add_service(stralloc *parsed_list,sv_alltype *sv_before,char const *service,unsigned int *nbsv,uid_t owner) ;
/** split */
extern int section_get_range(section_t *sasection,stralloc *src) ;
diff --git a/src/lib66/get_enum.c b/src/lib66/get_enum.c
index b2bd1bd8f22c6f59031b6a1e52d352d036926414..a3ccf551a3ed39d0121216690c7918b55e00787a 100644
--- a/src/lib66/get_enum.c
+++ b/src/lib66/get_enum.c
@@ -31,6 +31,7 @@ char const *get_keybyid(key_enum_t key)
(key == DESCRIPTION ) ? "@description" :
(key == CONTENTS ) ? "@contents" :
(key == DEPENDS ) ? "@depends" :
+ (key == OPTSDEPS ) ? "@optsdepends" :
(key == OPTIONS ) ? "@options" :
(key == NOTIFY ) ? "@notify" :
(key == USER ) ? "@user" :
diff --git a/src/lib66/parser_enabled.c b/src/lib66/parser_enabled.c
index 306c47bc8c2268cd1b43125f8a0a59679f672474..f808f4a006d011ce4f0325b46066fae5bbc721ec 100644
--- a/src/lib66/parser_enabled.c
+++ b/src/lib66/parser_enabled.c
@@ -92,7 +92,7 @@ int parse_add_service(stralloc *parsed_list,sv_alltype *sv_before,char const *se
return 0 ;
}
-int parse_service_deps(ssexec_t *info,stralloc *parsed_list, sv_alltype *sv_before, char const *sv,unsigned int *nbsv,stralloc *sasv,uint8_t force)
+int parse_service_deps(ssexec_t *info,stralloc *parsed_list,stralloc *opts_deps_list, sv_alltype *sv_before, char const *sv,unsigned int *nbsv,stralloc *sasv,uint8_t force)
{
uint8_t exist = 0 ;
char *dname = 0 ;
@@ -113,7 +113,7 @@ int parse_service_deps(ssexec_t *info,stralloc *parsed_list, sv_alltype *sv_befo
log_warnu("resolve source path of: ",dname) ;
goto err ;
}
- if (!parse_service_before(info,parsed_list,newsv.s,nbsv,sasv,force,&exist)) goto err ;
+ if (!parse_service_before(info,parsed_list,opts_deps_list,newsv.s,nbsv,sasv,force,&exist)) goto err ;
}
}
else log_trace(sv,": haven't dependencies") ;
@@ -124,7 +124,70 @@ int parse_service_deps(ssexec_t *info,stralloc *parsed_list, sv_alltype *sv_befo
return 0 ;
}
-int parse_service_before(ssexec_t *info,stralloc *parsed_list, char const *sv,unsigned int *nbsv, stralloc *sasv,uint8_t force,uint8_t *exist)
+int parse_service_opts_deps(ssexec_t *info,stralloc *parsed_list,stralloc *opts_deps_list,sv_alltype *sv_before,char const *sv,unsigned int *nbsv,stralloc *sasv,uint8_t force)
+{
+ stralloc newsv = STRALLOC_ZERO ;
+ size_t pos = 0 , baselen = strlen(info->base.s) + SS_SYSTEM_LEN ;
+ uint8_t exist = 0, found = 0 ;
+ char *optname = 0 ;
+ char btmp[baselen + 1] ;
+ auto_strings(btmp,info->base.s,SS_SYSTEM) ;
+
+ // only pass here for the first time
+ if (!opts_deps_list->len)
+ {
+ if (!sastr_dir_get(opts_deps_list, btmp,SS_BACKUP + 1, S_IFDIR)) log_warnusys_return(LOG_EXIT_ZERO,"get list of tree at: ",btmp) ;
+ }
+ if (sv_before->cname.nopts)
+ {
+ // may have no tree yet
+ if (opts_deps_list->len)
+ {
+ size_t id = sv_before->cname.idopts, nid = sv_before->cname.nopts ;
+ for (;nid; id += strlen(deps.s + id) + 1, nid--)
+ {
+
+ newsv.len = 0 ;
+ optname = deps.s + id ;
+
+ for(pos = 0 ; pos < opts_deps_list->len ; pos += strlen(opts_deps_list->s + pos) +1 )
+ {
+ found = 0 ;
+ char *tree = opts_deps_list->s + pos ;
+ size_t treelen = strlen(tree) ;
+ char tmp[baselen + 1 + treelen + SS_SVDIRS_LEN + 1] ;
+ auto_strings(tmp,btmp,"/",tree,SS_SVDIRS) ;
+
+ // already added on a tree
+ if (ss_resolve_check(tmp,optname))
+ {
+ found = 1 ;
+ log_trace("optional service dependency: ",optname," is already enabled at tree: ",btmp,"/",tree) ;
+ break ;
+ }
+ }
+ if (!found)
+ {
+ if (!ss_resolve_src_path(&newsv,optname,info))
+ {
+ log_warnu_return(LOG_EXIT_ZERO,"resolve source path of: ",optname) ;
+ goto err ;
+ }
+ if (!parse_service_before(info,parsed_list,opts_deps_list,newsv.s,nbsv,sasv,force,&exist))
+ goto err ;
+ }
+ }
+ }
+ }
+
+ stralloc_free(&newsv) ;
+ return 1 ;
+ err:
+ stralloc_free(&newsv) ;
+ return 0 ;
+}
+
+int parse_service_before(ssexec_t *info,stralloc *parsed_list,stralloc *opts_deps_list, char const *sv,unsigned int *nbsv, stralloc *sasv,uint8_t force,uint8_t *exist)
{
int r, insta ;
@@ -204,8 +267,10 @@ int parse_service_before(ssexec_t *info,stralloc *parsed_list, char const *sv,un
if (!parse_add_service(parsed_list,&sv_before,svpath,nbsv,info->owner)) return 0 ;
if ((sv_before.cname.itype > CLASSIC && force > 1) || !(*exist))
- if (!parse_service_deps(info,parsed_list,&sv_before,sv,nbsv,sasv,force)) return 0 ;
-
+ {
+ if (!parse_service_deps(info,parsed_list,opts_deps_list,&sv_before,sv,nbsv,sasv,force)) return 0 ;
+ if (!parse_service_opts_deps(info,parsed_list,opts_deps_list,&sv_before,sv,nbsv,sasv,force)) return 0 ;
+ }
freed:
return 1 ;
}
diff --git a/src/lib66/parser_utils.c b/src/lib66/parser_utils.c
index 82594cdd495069ba5eb8ce37a11b1979f62c2289..1000f542720e4d00b6964c6c687046cff8a43990 100644
--- a/src/lib66/parser_utils.c
+++ b/src/lib66/parser_utils.c
@@ -634,6 +634,17 @@ int keep_common(sv_alltype *service,keynocheck *nocheck,int svtype)
service->cname.nga++ ;
}
break ;
+ case OPTSDEPS:
+ if ((service->cname.itype == CLASSIC) || (service->cname.itype == BUNDLE))
+ log_warn_return(LOG_EXIT_ZERO,"key: ",get_keybyid(nocheck->idkey),": is not valid for type ",get_keybyid(service->cname.itype)) ;
+ if (!get_clean_val(nocheck)) return 0 ;
+ service->cname.idopts = deps.len ;
+ for (;pos < *chlen; pos += strlen(chval + pos)+1)
+ {
+ if (!stralloc_catb(&deps,chval + pos,strlen(chval + pos) + 1)) log_warnsys_return(LOG_EXIT_ZERO,"stralloc") ;
+ service->cname.nopts++ ;
+ }
+ break ;
case CONTENTS:
if (service->cname.itype != BUNDLE)
log_warn_return(LOG_EXIT_ZERO,"key: ",get_keybyid(nocheck->idkey),": is not valid for type ",get_keybyid(service->cname.itype)) ;
diff --git a/src/lib66/ssexec_enable.c b/src/lib66/ssexec_enable.c
index 5ac0862fd899b920532574781dd271d7257a6f59..4a1f6ad1f467bc3e1d08069697f1789dc1f63625 100644
--- a/src/lib66/ssexec_enable.c
+++ b/src/lib66/ssexec_enable.c
@@ -61,7 +61,8 @@ static void start_parser(stralloc *list,ssexec_t *info, unsigned int *nbsv)
size_t i = 0, len = list->len ;
stralloc sasv = STRALLOC_ZERO ;
- stralloc tmp = STRALLOC_ZERO ;
+ stralloc parsed_list = STRALLOC_ZERO ;
+ stralloc opts_deps_list = STRALLOC_ZERO ;
for (;i < len; i += strlen(list->s + i) + 1)
{
@@ -73,11 +74,12 @@ static void start_parser(stralloc *list,ssexec_t *info, unsigned int *nbsv)
r = parse_service_check_enabled(info,svname,FORCE,&exist) ;
if (!r) log_dieu(LOG_EXIT_SYS,"check enabled service: ",svname) ;
if (r == 2) continue ;
- if (!parse_service_before(info,&tmp,name,nbsv,&sasv,FORCE,&exist))
+ if (!parse_service_before(info,&parsed_list,&opts_deps_list,name,nbsv,&sasv,FORCE,&exist))
log_dieu(LOG_EXIT_SYS,"parse service file: ",svname,": or its dependencies") ;
}
stralloc_free(&sasv) ;
- stralloc_free(&tmp) ;
+ stralloc_free(&parsed_list) ;
+ stralloc_free(&opts_deps_list) ;
}
int ssexec_enable(int argc, char const *const *argv,char const *const *envp,ssexec_t *info)