diff --git a/src/include/66/sanitize.h b/src/include/66/sanitize.h index c1dcf0ece019335f3f2d9d549ca203267b6946c1..98c58a2ecff105c0487c947468583aca7b0694e6 100644 --- a/src/include/66/sanitize.h +++ b/src/include/66/sanitize.h @@ -23,7 +23,7 @@ extern int sanitize_system(ssexec_t *info) ; -extern void sanitize_source(char const *name, ssexec_t *info) ; +extern void sanitize_source(char const *name, ssexec_t *info, uint32_t flag) ; extern int sanitize_fdholder(resolve_service_t *res, ss_state_t *sta, uint32_t flag) ; extern int sanitize_livestate(resolve_service_t *res, ss_state_t *sta) ; extern int sanitize_scandir(resolve_service_t *res, ss_state_t *sta) ; diff --git a/src/lib66/exec/ssexec_enable.c b/src/lib66/exec/ssexec_enable.c index e5cd440d09bdcf60bf157766867820077f49027d..f3eb4d60de99cb17c0e8a062f33d100e280645be 100644 --- a/src/lib66/exec/ssexec_enable.c +++ b/src/lib66/exec/ssexec_enable.c @@ -83,7 +83,7 @@ int ssexec_enable(int argc, char const *const *argv, ssexec_t *info) _init_stack_(stk, argc * SS_MAX_TREENAME) ; for(; n < argc ; n++) - sanitize_source(argv[n], info) ; + sanitize_source(argv[n], info, flag) ; /** build the graph of the entire system */ graph_build_service(&graph, ares, &areslen, info, flag) ; diff --git a/src/lib66/exec/ssexec_reconfigure.c b/src/lib66/exec/ssexec_reconfigure.c index bca2d83664172411526510a6663b091c1c963b03..9a02032db48d565ba0d24529a29a629bdf7dda64 100644 --- a/src/lib66/exec/ssexec_reconfigure.c +++ b/src/lib66/exec/ssexec_reconfigure.c @@ -100,7 +100,7 @@ int ssexec_reconfigure(int argc, char const *const *argv, ssexec_t *info) if (!state_read(&sta, &ares[aresid])) log_dieu(LOG_EXIT_SYS, "read state file of: ", argv[n]) ; - sta.isparsed = STATE_FLAGS_FALSE ; + sta.toparse = STATE_FLAGS_TRUE ; if (!state_write(&sta, &ares[aresid])) log_dieusys(LOG_EXIT_SYS, "write status file of: ", argv[n]) ; @@ -193,7 +193,7 @@ int ssexec_reconfigure(int argc, char const *const *argv, ssexec_t *info) /** force to parse again the service */ for (n = 0 ; n < argc ; n++) - sanitize_source(argv[n], info) ; + sanitize_source(argv[n], info, flag) ; for (n = 0 ; n < ntostate ; n++) { @@ -201,14 +201,13 @@ int ssexec_reconfigure(int argc, char const *const *argv, ssexec_t *info) * Reverse to the previous state of the isparsed flag. */ if (state_read_remote(&sta, ares[tostate[n]].sa.s + ares[tostate[n]].live.statedir)) { - sta.isparsed = STATE_FLAGS_TRUE ; + sta.toparse = STATE_FLAGS_FALSE ; if (!state_write_remote(&sta, ares[tostate[n]].sa.s + ares[tostate[n]].live.statedir)) log_warnusys("write status file of: ", ares[tostate[n]].sa.s + ares[tostate[n]].live.statedir) ; } } - if (nservice && r) { unsigned int m = 0 ; diff --git a/src/lib66/exec/ssexec_start.c b/src/lib66/exec/ssexec_start.c index fbe44c38ea67145be14789085edf13fcf377c704..8e14b68e86fd97c73ecb87410a65204e51d677b7 100644 --- a/src/lib66/exec/ssexec_start.c +++ b/src/lib66/exec/ssexec_start.c @@ -87,7 +87,7 @@ int ssexec_start(int argc, char const *const *argv, ssexec_t *info) * or the later call of service_array_search does not find the corresponding * resolve file in the second case. * At least try to parse the corresponding frontend file. */ - sanitize_source(argv[n], info) ; + sanitize_source(argv[n], info, flag) ; /** build the graph of the entire system */ graph_build_service(&graph, ares, &areslen, info, flag) ;