diff --git a/README.md b/README.md index 4157539bc02e3c4a209df32ad841042ed16b08b7..caab6464fba7d4bf2ce581f18d851d79657ef550 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - + 66 - Helpers tools around S6 supervision suite === diff --git a/src/lib66/exec/ssexec_intree.c b/src/lib66/exec/ssexec_intree.c index 27a7911f7ba1933c9e6eb88061257ffaa60fad75..8208a16a8464b9b3880f46246d53bd924d16ccf7 100644 --- a/src/lib66/exec/ssexec_intree.c +++ b/src/lib66/exec/ssexec_intree.c @@ -151,7 +151,7 @@ static void info_display_depends(char const *field, char const *treename) if (NOFIELD) padding = info_display_field_name(field) ; else { field = 0 ; padding = 0 ; } - graph_build_tree(&graph, base.s) ; + graph_build_tree(&graph, base.s, E_RESOLVE_TREE_MASTER_CONTENTS) ; r = graph_matrix_get_edge_g_sorted_sa(&sa, &graph, treename, 0, 0) ; if (r < 0) @@ -211,7 +211,7 @@ static void info_display_requiredby(char const *field, char const *treename) if (NOFIELD) padding = info_display_field_name(field) ; else { field = 0 ; padding = 0 ; } - graph_build_tree(&graph, base.s) ; + graph_build_tree(&graph, base.s, E_RESOLVE_TREE_MASTER_CONTENTS) ; r = graph_matrix_get_edge_g_sorted_sa(&sa, &graph, treename, 1, 0) ; if (r < 0) diff --git a/src/lib66/exec/ssexec_tree.c b/src/lib66/exec/ssexec_tree.c index 659d357daf84f869e85ee8bb439e8a2d1d9ad9df..64b998c1daf8981303cac0a4bba66d210cb01e8a 100644 --- a/src/lib66/exec/ssexec_tree.c +++ b/src/lib66/exec/ssexec_tree.c @@ -307,7 +307,7 @@ static void tree_parse_options_depends(graph_t *g, ssexec_t *info, char const *s newinfo.help = info->help ; newinfo.usage = info->usage ; newinfo.opt_color = info->opt_color ; - newinfo.skip_opt_tree = info->skip_opt_tree ; + newinfo.opt_tree = info->opt_tree ; int nwhat = what->noseed ? 2 : 0 ; @@ -325,7 +325,7 @@ static void tree_parse_options_depends(graph_t *g, ssexec_t *info, char const *s newargv[m++] = name ; newargv[m++] = 0 ; - log_trace("launch 66-tree sub-process for tree: ", name) ; + log_trace("launch 66 tree sub-process for tree: ", name) ; PROG = "tree" ; if (ssexec_tree(nargc, newargv, &newinfo)) @@ -1358,7 +1358,7 @@ int ssexec_tree(int argc, char const *const *argv, ssexec_t *info) if (!r && what.remove) log_dieusys(LOG_EXIT_SYS,"find tree: ", info->treename.s) ; - graph_build_tree(&graph, info->base.s) ; + graph_build_tree(&graph, info->base.s, E_RESOLVE_TREE_MASTER_CONTENTS) ; if (what.remove) { tree_remove(&graph, info->base.s, info->treename.s) ; diff --git a/src/lib66/graph/graph_build_g.c b/src/lib66/graph/graph_build_g.c index 0cb486117c49bb0986ff8ad424e1eefee8c7b623..4d98f929fef38c46ba7b8f2ea3329043022e16fa 100644 --- a/src/lib66/graph/graph_build_g.c +++ b/src/lib66/graph/graph_build_g.c @@ -30,5 +30,5 @@ void graph_build_g(graph_t *graph, resolve_service_t *ares, unsigned int *aresle else if (data_type == DATA_TREE) - graph_build_tree(g, info->base.s) ; + graph_build_tree(g, info->base.s, E_RESOLVE_TREE_MASTER_CONTENTS) ; } diff --git a/src/lib66/graph/graph_build_tree.c b/src/lib66/graph/graph_build_tree.c index 155069f525a3bd4f0e72031faac8c2af90543b6f..6ea14f4fcaefda07391bda6934454af48e82a5eb 100644 --- a/src/lib66/graph/graph_build_tree.c +++ b/src/lib66/graph/graph_build_tree.c @@ -27,7 +27,7 @@ #include <66/tree.h> #include <66/graph.h> -void graph_build_tree(graph_t *g, char const *base) +void graph_build_tree(graph_t *g, char const *base, resolve_tree_master_enum_t field) { log_flow() ; @@ -37,7 +37,7 @@ void graph_build_tree(graph_t *g, char const *base) resolve_tree_t tres = RESOLVE_TREE_ZERO ; resolve_wrapper_t_ref wres = resolve_set_struct(DATA_TREE, &tres) ; - if (!resolve_get_field_tosa_g(&sa, base, SS_MASTER + 1, DATA_TREE_MASTER, E_RESOLVE_TREE_MASTER_CONTENTS)) + if (!resolve_get_field_tosa_g(&sa, base, SS_MASTER + 1, DATA_TREE_MASTER, field)) log_dieu(LOG_EXIT_SYS, "get resolve Master file of trees") ; FOREACH_SASTR(&sa, pos) {