diff --git a/src/lib66/exec/ssexec_enable.c b/src/lib66/exec/ssexec_enable.c index 72fb3f95ee2fbaa6e250fbc0a2f14367fde2ee9a..8768d208f9d3e2928cf632ed9eb7b7dcb2937b4e 100644 --- a/src/lib66/exec/ssexec_enable.c +++ b/src/lib66/exec/ssexec_enable.c @@ -132,18 +132,7 @@ int ssexec_enable(int argc, char const *const *argv, ssexec_t *info) log_die(LOG_EXIT_USER, "services selection is not available -- try first to install the corresponding frontend file") ; for (n = 0 ; n < argc ; n++) { - /** - * - * - * need to check if the service is declared at the same tree - * than asked: - * sA on tA - * ask sA on tB by the -t options - * - * in this case we need to remove sA from the resolve file of the tree tA - * - * - * */ + service_enable_disable(&graph, info->base.s, argv[n], 1) ; if (!sastr_add_string(&sa, argv[n])) diff --git a/src/lib66/exec/ssexec_env.c b/src/lib66/exec/ssexec_env.c index 888df72369812bc00a9d532b6b4f9634131501ac..cc9372966b0220f174c7f32262640706adb3566c 100644 --- a/src/lib66/exec/ssexec_env.c +++ b/src/lib66/exec/ssexec_env.c @@ -192,7 +192,7 @@ static void write_user_env_file(char const *src, char const *sv) r = str_contain(sa.s,"[ENDWARN]") ; if (r == -1) - log_die(LOG_EXIT_SYS,"invalid upstream configuration file! Do you have modified it? Tries to enable the service again.") ; + log_die(LOG_EXIT_SYS,"invalid upstream configuration file! Do you have modified it? Tries to parse the service again.") ; write_environ(sv, sa.s + r, src) ; } diff --git a/src/lib66/exec/ssexec_help.c b/src/lib66/exec/ssexec_help.c index 424394d78270c25cf00cc52e5bf080baebf50e83..f44112a25445946da97567ff44e0bffb7f816ddf 100644 --- a/src/lib66/exec/ssexec_help.c +++ b/src/lib66/exec/ssexec_help.c @@ -47,7 +47,7 @@ char const *help_66 = " env: manage service environment variable\n" " service: manage/see service information\n" " tree: manage/see tree information\n" -" init: initiate to scandir all service declared inside tree\n" +" init: initiate to scandir all services marked enabled at tree\n" " parse: parse the service frontend file\n" " signal: send signal to service\n" " scanctl: send signal to scandir\n" @@ -237,7 +237,7 @@ char const *help_tree_wrapper = "options:\n" " -h: print this help\n" "\n" -"command:" +"command:\n" " create: create tree\n" " admin: manage tree\n" " remove: remove tree\n" @@ -253,7 +253,7 @@ char const *help_tree_wrapper = "Use '66 tree <command> -h' to see command options\n" ; -char const *usage_tree_create = "66 tree create [ -h ] [ -o depends=,requiredby=,... ] tree" ; +char const *usage_tree_create = "66 tree create [ -h ] [ -o depends=:requiredby=:... ] tree" ; char const *help_tree_create = "\ncreate a tree\n" @@ -273,7 +273,7 @@ char const *help_tree_create = " noseed: do not use seed file to build the tree\n" ; -char const *usage_tree_admin = "66 tree admin [ -h ] [ -o depends=,requiredby=,... ] tree" ; +char const *usage_tree_admin = "66 tree admin [ -h ] [ -o depends=:requiredby=:... ] tree" ; char const *help_tree_admin = "\nadministrate an existing tree\n" diff --git a/src/lib66/exec/ssexec_service_state.c b/src/lib66/exec/ssexec_service_state.c index 32e02d349f29b093c6218fa838dfd9fdadc567e3..403fb6f0e4cf4f2313aa21fa8bf5ef6955b66a95 100644 --- a/src/lib66/exec/ssexec_service_state.c +++ b/src/lib66/exec/ssexec_service_state.c @@ -39,9 +39,6 @@ static wchar_t const field_suffix[] = L" :" ; static char fields[INFO_NKEY][INFO_FIELD_MAXLEN] = {{ 0 }} ; -#define USAGE "66-instate [ -h ] [ -v verbosity ] [ -z ] service" - - static void info_display_string(char const *field,char const *str) { info_display_field_name(field) ;