Skip to content
Snippets Groups Projects
Commit d6106d2e authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

Provide ability to declare depends and requiredby at module configuration time

parent 4f13bcbd
No related branches found
No related tags found
No related merge requests found
......@@ -30,11 +30,15 @@
#define SS_MODULE_FRONTEND_LEN (sizeof SS_MODULE_FRONTEND - 1)
#define SS_MODULE_ACTIVATED "/activated"
#define SS_MODULE_ACTIVATED_LEN (sizeof SS_MODULE_ACTIVATED - 1)
#define SS_MODULE_DEPENDS "/depends"
#define SS_MODULE_DEPENDS_LEN (sizeof SS_MODULE_DEPENDS - 1)
#define SS_MODULE_REQUIREDBY "/requiredby"
#define SS_MODULE_REQUIREDBY_LEN (sizeof SS_MODULE_REQUIREDBY - 1)
extern void get_list(stralloc *list, char const *src, char const *name, mode_t mode) ;
extern void parse_module(resolve_service_t *res, resolve_service_t *ares, unsigned int *areslen, ssexec_t *info, uint8_t force) ;
extern void parse_module_check_dir(char const *src,char const *dir) ;
extern void parse_module_check_name(char const *src, char const *name) ;
extern void regex_configure(resolve_service_t *res, ssexec_t *info, char const *path, char const *name) ;
extern int regex_get_file_name(char *filename, char const *str) ;
extern void regex_get_regex(char *regex, char const *str) ;
......@@ -42,4 +46,5 @@ extern void regex_get_replace(char *replace, char const *str) ;
extern void regex_rename(stralloc *list, resolve_service_t *res, uint32_t element) ;
extern void regex_replace(stralloc *list, resolve_service_t *res) ;
extern void get_list(stralloc *list, char const *src, char const *name, mode_t mode, char const **exclude) ;
#endif
......@@ -27,6 +27,7 @@
#include <66/ssexec.h>
#include <66/utils.h>
#include <66/sanitize.h>
#include <66/module.h>
int ssexec_parse(int argc, char const *const *argv, ssexec_t *info)
{
......@@ -86,7 +87,7 @@ int ssexec_parse(int argc, char const *const *argv, ssexec_t *info)
char bname[namelen + 1] ;
char dname[namelen + 1] ;
char const *directory_forced = 0 ;
char const *exclude[1] = { 0 } ;
char const *exclude[3] = { SS_MODULE_ACTIVATED + 1, SS_MODULE_FRONTEND + 1, 0 } ;
if (argv[0][0] == '/') {
......
......@@ -22,12 +22,11 @@
#include <66/module.h>
void get_list(stralloc *list, char const *src, char const *name, mode_t mode)
void get_list(stralloc *list, char const *src, char const *name, mode_t mode, char const **exclude)
{
log_flow() ;
list->len = 0 ;
char const *exclude[2] = { SS_MODULE_CONFIG_DIR + 1, 0 } ;
if (!sastr_dir_get_recursive(list, src, exclude, mode, 1))
log_dieusys(LOG_EXIT_SYS,"get file(s) of module: ", name) ;
......
This diff is collapsed.
......@@ -25,6 +25,7 @@
#include <66/parse.h>
#include <66/resolve.h>
#include <66/service.h>
#include <66/module.h>
/**
* @opts -> 1 : build list removing commented optional deps
......@@ -38,7 +39,7 @@ int parse_compute_list(resolve_wrapper_t_ref wres, stralloc *sa, uint32_t *res,
size_t len = sa->len, pos = 0 ;
size_t nelement = sastr_nelement(sa) ;
stralloc tmp = STRALLOC_ZERO ;
char const *exclude[1] = { 0 } ;
char const *exclude[3] = { SS_MODULE_ACTIVATED + 1, SS_MODULE_FRONTEND + 1, 0 } ;
char f[len + nelement + 2] ;
......
......@@ -28,6 +28,7 @@
#include <66/utils.h>
#include <66/constants.h>
#include <66/instance.h>
#include <66/module.h>
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)
{
......@@ -36,7 +37,8 @@ int parse_interdependences(char const *service, char const *list, unsigned int l
int r, e = 0 ;
size_t pos = 0, len = 0 ;
stralloc sa = STRALLOC_ZERO ;
char const *exclude[1] = { 0 } ;
char const *exclude[4] = { SS_MODULE_ACTIVATED + 1, SS_MODULE_FRONTEND + 1, SS_MODULE_CONFIG_DIR, 0 } ;
if (listlen) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment