From 04a716683033f8e94ee342bd8b21ac33fcd8f03e Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Mon, 30 Jan 2023 22:11:12 +1100
Subject: [PATCH] reorganize ssexec_XXX function family name
---
package/deps.mak | 22 +++++++-------
src/66/66.c | 6 ++--
src/include/66/ssexec.h | 29 ++++++++++---------
src/lib66/exec/deps-lib/deps | 18 ++++++------
src/lib66/exec/ssexec_help.c | 10 ++++---
...lve_service.c => ssexec_service_resolve.c} | 4 +--
...ssexec_svctl.c => ssexec_service_signal.c} | 4 +--
...sexec_instate.c => ssexec_service_state.c} | 4 +--
...ec_inservice.c => ssexec_service_status.c} | 4 +--
src/lib66/exec/ssexec_service_wrapper.c | 6 ++--
.../{ssexec_tree.c => ssexec_tree_admin.c} | 6 ++--
...c_resolve_tree.c => ssexec_tree_resolve.c} | 4 +--
...{ssexec_treectl.c => ssexec_tree_signal.c} | 4 +--
.../{ssexec_intree.c => ssexec_tree_status.c} | 4 +--
src/lib66/exec/ssexec_tree_wrapper.c | 22 +++++++-------
src/lib66/sanitize/sanitize_system.c | 2 +-
src/lib66/svc/svc_send.c | 2 +-
src/lib66/tree/tree_sethome.c | 2 +-
18 files changed, 79 insertions(+), 74 deletions(-)
rename src/lib66/exec/{ssexec_resolve_service.c => ssexec_service_resolve.c} (99%)
rename src/lib66/exec/{ssexec_svctl.c => ssexec_service_signal.c} (99%)
rename src/lib66/exec/{ssexec_instate.c => ssexec_service_state.c} (97%)
rename src/lib66/exec/{ssexec_inservice.c => ssexec_service_status.c} (99%)
rename src/lib66/exec/{ssexec_tree.c => ssexec_tree_admin.c} (99%)
rename src/lib66/exec/{ssexec_resolve_tree.c => ssexec_tree_resolve.c} (98%)
rename src/lib66/exec/{ssexec_treectl.c => ssexec_tree_signal.c} (99%)
rename src/lib66/exec/{ssexec_intree.c => ssexec_tree_status.c} (99%)
diff --git a/package/deps.mak b/package/deps.mak
index be1be24f..2311c829 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -44,24 +44,24 @@ src/lib66/exec/ssexec_env.o src/lib66/exec/ssexec_env.lo: src/lib66/exec/ssexec_
src/lib66/exec/ssexec_free.o src/lib66/exec/ssexec_free.lo: src/lib66/exec/ssexec_free.c src/include/66/ssexec.h
src/lib66/exec/ssexec_help.o src/lib66/exec/ssexec_help.lo: src/lib66/exec/ssexec_help.c src/include/66/ssexec.h
src/lib66/exec/ssexec_init.o src/lib66/exec/ssexec_init.lo: src/lib66/exec/ssexec_init.c src/include/66/config.h src/include/66/constants.h src/include/66/graph.h src/include/66/sanitize.h src/include/66/service.h src/include/66/ssexec.h src/include/66/state.h src/include/66/svc.h src/include/66/tree.h
-src/lib66/exec/ssexec_inservice.o src/lib66/exec/ssexec_inservice.lo: src/lib66/exec/ssexec_inservice.c src/include/66/config.h src/include/66/constants.h src/include/66/enum.h src/include/66/environ.h src/include/66/graph.h src/include/66/info.h src/include/66/resolve.h src/include/66/service.h src/include/66/ssexec.h src/include/66/state.h src/include/66/tree.h src/include/66/utils.h
-src/lib66/exec/ssexec_instate.o src/lib66/exec/ssexec_instate.lo: src/lib66/exec/ssexec_instate.c src/include/66/config.h src/include/66/constants.h src/include/66/info.h src/include/66/resolve.h src/include/66/ssexec.h src/include/66/state.h src/include/66/utils.h
-src/lib66/exec/ssexec_intree.o src/lib66/exec/ssexec_intree.lo: src/lib66/exec/ssexec_intree.c src/include/66/constants.h src/include/66/enum.h src/include/66/graph.h src/include/66/info.h src/include/66/resolve.h src/include/66/service.h src/include/66/ssexec.h src/include/66/tree.h src/include/66/utils.h
src/lib66/exec/ssexec_parse.o src/lib66/exec/ssexec_parse.lo: src/lib66/exec/ssexec_parse.c src/include/66/parser.h src/include/66/ssexec.h src/include/66/utils.h
src/lib66/exec/ssexec_reconfigure.o src/lib66/exec/ssexec_reconfigure.lo: src/lib66/exec/ssexec_reconfigure.c src/include/66/config.h src/include/66/graph.h src/include/66/sanitize.h src/include/66/service.h src/include/66/ssexec.h src/include/66/state.h src/include/66/svc.h
src/lib66/exec/ssexec_reload.o src/lib66/exec/ssexec_reload.lo: src/lib66/exec/ssexec_reload.c src/include/66/config.h src/include/66/enum.h src/include/66/graph.h src/include/66/sanitize.h src/include/66/service.h src/include/66/ssexec.h src/include/66/state.h src/include/66/svc.h
-src/lib66/exec/ssexec_resolve_service.o src/lib66/exec/ssexec_resolve_service.lo: src/lib66/exec/ssexec_resolve_service.c src/include/66/config.h src/include/66/constants.h src/include/66/info.h src/include/66/resolve.h src/include/66/service.h src/include/66/ssexec.h src/include/66/state.h src/include/66/utils.h
-src/lib66/exec/ssexec_resolve_tree.o src/lib66/exec/ssexec_resolve_tree.lo: src/lib66/exec/ssexec_resolve_tree.c src/include/66/config.h src/include/66/constants.h src/include/66/info.h src/include/66/resolve.h src/include/66/ssexec.h src/include/66/state.h src/include/66/tree.h src/include/66/utils.h
src/lib66/exec/ssexec_restart.o src/lib66/exec/ssexec_restart.lo: src/lib66/exec/ssexec_restart.c src/include/66/config.h src/include/66/enum.h src/include/66/graph.h src/include/66/sanitize.h src/include/66/service.h src/include/66/ssexec.h src/include/66/state.h src/include/66/svc.h
src/lib66/exec/ssexec_scanctl.o src/lib66/exec/ssexec_scanctl.lo: src/lib66/exec/ssexec_scanctl.c src/include/66/ssexec.h src/include/66/svc.h src/include/66/utils.h
src/lib66/exec/ssexec_scandir.o src/lib66/exec/ssexec_scandir.lo: src/lib66/exec/ssexec_scandir.c src/include/66/config.h src/include/66/constants.h src/include/66/enum.h src/include/66/ssexec.h src/include/66/svc.h src/include/66/utils.h
src/lib66/exec/ssexec_service_admin.o src/lib66/exec/ssexec_service_admin.lo: src/lib66/exec/ssexec_service_admin.c src/include/66/config.h src/include/66/ssexec.h
+src/lib66/exec/ssexec_service_resolve.o src/lib66/exec/ssexec_service_resolve.lo: src/lib66/exec/ssexec_service_resolve.c src/include/66/config.h src/include/66/constants.h src/include/66/info.h src/include/66/resolve.h src/include/66/service.h src/include/66/ssexec.h src/include/66/state.h src/include/66/utils.h
+src/lib66/exec/ssexec_service_signal.o src/lib66/exec/ssexec_service_signal.lo: src/lib66/exec/ssexec_service_signal.c src/include/66/constants.h src/include/66/enum.h src/include/66/graph.h src/include/66/resolve.h src/include/66/service.h src/include/66/ssexec.h src/include/66/state.h src/include/66/svc.h src/include/66/utils.h
+src/lib66/exec/ssexec_service_state.o src/lib66/exec/ssexec_service_state.lo: src/lib66/exec/ssexec_service_state.c src/include/66/config.h src/include/66/constants.h src/include/66/info.h src/include/66/resolve.h src/include/66/ssexec.h src/include/66/state.h src/include/66/utils.h
+src/lib66/exec/ssexec_service_status.o src/lib66/exec/ssexec_service_status.lo: src/lib66/exec/ssexec_service_status.c src/include/66/config.h src/include/66/constants.h src/include/66/enum.h src/include/66/environ.h src/include/66/graph.h src/include/66/info.h src/include/66/resolve.h src/include/66/service.h src/include/66/ssexec.h src/include/66/state.h src/include/66/tree.h src/include/66/utils.h
src/lib66/exec/ssexec_service_wrapper.o src/lib66/exec/ssexec_service_wrapper.lo: src/lib66/exec/ssexec_service_wrapper.c src/include/66/config.h src/include/66/ssexec.h
src/lib66/exec/ssexec_start.o src/lib66/exec/ssexec_start.lo: src/lib66/exec/ssexec_start.c src/include/66/config.h src/include/66/graph.h src/include/66/sanitize.h src/include/66/service.h src/include/66/ssexec.h src/include/66/state.h src/include/66/svc.h
src/lib66/exec/ssexec_stop.o src/lib66/exec/ssexec_stop.lo: src/lib66/exec/ssexec_stop.c src/include/66/config.h src/include/66/graph.h src/include/66/service.h src/include/66/ssexec.h src/include/66/state.h src/include/66/svc.h
-src/lib66/exec/ssexec_svctl.o src/lib66/exec/ssexec_svctl.lo: src/lib66/exec/ssexec_svctl.c src/include/66/constants.h src/include/66/enum.h src/include/66/graph.h src/include/66/resolve.h src/include/66/service.h src/include/66/ssexec.h src/include/66/state.h src/include/66/svc.h src/include/66/utils.h
-src/lib66/exec/ssexec_tree.o src/lib66/exec/ssexec_tree.lo: src/lib66/exec/ssexec_tree.c src/include/66/config.h src/include/66/constants.h src/include/66/enum.h src/include/66/graph.h src/include/66/resolve.h src/include/66/sanitize.h src/include/66/service.h src/include/66/state.h src/include/66/tree.h src/include/66/utils.h
-src/lib66/exec/ssexec_treectl.o src/lib66/exec/ssexec_treectl.lo: src/lib66/exec/ssexec_treectl.c src/include/66/constants.h src/include/66/graph.h src/include/66/ssexec.h src/include/66/svc.h src/include/66/tree.h src/include/66/utils.h
+src/lib66/exec/ssexec_tree_admin.o src/lib66/exec/ssexec_tree_admin.lo: src/lib66/exec/ssexec_tree_admin.c src/include/66/config.h src/include/66/constants.h src/include/66/enum.h src/include/66/graph.h src/include/66/resolve.h src/include/66/sanitize.h src/include/66/service.h src/include/66/state.h src/include/66/tree.h src/include/66/utils.h
+src/lib66/exec/ssexec_tree_resolve.o src/lib66/exec/ssexec_tree_resolve.lo: src/lib66/exec/ssexec_tree_resolve.c src/include/66/config.h src/include/66/constants.h src/include/66/info.h src/include/66/resolve.h src/include/66/ssexec.h src/include/66/state.h src/include/66/tree.h src/include/66/utils.h
+src/lib66/exec/ssexec_tree_signal.o src/lib66/exec/ssexec_tree_signal.lo: src/lib66/exec/ssexec_tree_signal.c src/include/66/constants.h src/include/66/graph.h src/include/66/ssexec.h src/include/66/svc.h src/include/66/tree.h src/include/66/utils.h
+src/lib66/exec/ssexec_tree_status.o src/lib66/exec/ssexec_tree_status.lo: src/lib66/exec/ssexec_tree_status.c src/include/66/constants.h src/include/66/enum.h src/include/66/graph.h src/include/66/info.h src/include/66/resolve.h src/include/66/service.h src/include/66/ssexec.h src/include/66/tree.h src/include/66/utils.h
src/lib66/exec/ssexec_tree_wrapper.o src/lib66/exec/ssexec_tree_wrapper.lo: src/lib66/exec/ssexec_tree_wrapper.c src/include/66/config.h src/include/66/ssexec.h
src/lib66/graph/graph_build_g.o src/lib66/graph/graph_build_g.lo: src/lib66/graph/graph_build_g.c src/include/66/graph.h src/include/66/resolve.h src/include/66/service.h src/include/66/ssexec.h
src/lib66/graph/graph_build_service_bytree.o src/lib66/graph/graph_build_service_bytree.lo: src/lib66/graph/graph_build_service_bytree.c src/include/66/constants.h src/include/66/enum.h src/include/66/graph.h src/include/66/resolve.h src/include/66/service.h src/include/66/state.h
@@ -257,9 +257,9 @@ src/lib66/write/write_uint.o src/lib66/write/write_uint.lo: src/lib66/write/writ
execl-envfile: EXTRA_LIBS := -loblibs -lexecline -lskarnet
execl-envfile: src/extra-tools/execl-envfile.o ${LIBEXECLINE}
ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
-lib66.a.xyzzy: src/lib66/enum/enum.o src/lib66/environ/env_append_version.o src/lib66/environ/env_check_version.o src/lib66/environ/env_clean_with_comment.o src/lib66/environ/env_compute.o src/lib66/environ/env_find_current_version.o src/lib66/environ/env_import_version_file.o src/lib66/environ/env_make_symlink.o src/lib66/environ/env_prepare_for_write.o src/lib66/environ/env_resolve_conf.o src/lib66/exec/ssexec_boot.o src/lib66/exec/ssexec_copy.o src/lib66/exec/ssexec_disable.o src/lib66/exec/ssexec_enable.o src/lib66/exec/ssexec_env.o src/lib66/exec/ssexec_free.o src/lib66/exec/ssexec_help.o src/lib66/exec/ssexec_init.o src/lib66/exec/ssexec_inservice.o src/lib66/exec/ssexec_instate.o src/lib66/exec/ssexec_intree.o src/lib66/exec/ssexec_parse.o src/lib66/exec/ssexec_reconfigure.o src/lib66/exec/ssexec_reload.o src/lib66/exec/ssexec_resolve_service.o src/lib66/exec/ssexec_resolve_tree.o src/lib66/exec/ssexec_restart.o src/lib66/exec/ssexec_scanctl.o src/lib66/exec/ssexec_scandir.o src/lib66/exec/ssexec_service_wrapper.o src/lib66/exec/ssexec_start.o src/lib66/exec/ssexec_stop.o src/lib66/exec/ssexec_svctl.o src/lib66/exec/ssexec_tree.o src/lib66/exec/ssexec_treectl.o src/lib66/exec/ssexec_service_admin.o src/lib66/exec/ssexec_tree_wrapper.o src/lib66/graph/graph_build_service.o src/lib66/graph/graph_build_service_bytree.o src/lib66/graph/graph_build_service_bytree_from_src.o src/lib66/graph/graph_build_service_from_sastr.o src/lib66/graph/graph_build_tree.o src/lib66/graph/graph_compute_dependencies.o src/lib66/graph/graph_remove_deps.o src/lib66/info/info_display_field_name.o src/lib66/info/info_display_list.o src/lib66/info/info_display_nline.o src/lib66/info/info_field_align.o src/lib66/info/info_getcols_fd.o src/lib66/info/info_graph_display.o src/lib66/info/info_graph_display_service.o src/lib66/info/info_graph_display_tree.o src/lib66/info/info_graph_init.o src/lib66/info/info_length_from_wchar.o src/lib66/info/info_walk.o src/lib66/instance/instance_check.o src/lib66/instance/instance_create.o src/lib66/instance/instance_splitname.o src/lib66/parse/parse_clean_line.o src/lib66/parse/parse_clean_list.o src/lib66/parse/parse_clean_quotes.o src/lib66/parse/parse_clean_runas.o src/lib66/parse/parse_compute_list.o src/lib66/parse/parse_compute_resolve.o src/lib66/parse/parse_contents.o src/lib66/parse/parse_dependencies.o src/lib66/parse/parse_error.o src/lib66/parse/parse_frontend.o src/lib66/parse/parse_line_g.o src/lib66/parse/parse_mandatory.o src/lib66/parse/parse_module.o src/lib66/parse/parse_parentheses.o src/lib66/parse/parse_section.o src/lib66/parse/parse_service.o src/lib66/parse/parse_split_from_section.o src/lib66/parse/parse_store_environ.o src/lib66/parse/parse_store_g.o src/lib66/parse/parse_store_logger.o src/lib66/parse/parse_store_main.o src/lib66/parse/parse_store_regex.o src/lib66/parse/parse_store_start_stop.o src/lib66/resolve/resolve_add_cdb.o src/lib66/resolve/resolve_add_cdb_uint.o src/lib66/resolve/resolve_add_string.o src/lib66/resolve/resolve_check.o src/lib66/resolve/resolve_check_g.o src/lib66/resolve/resolve_find_cdb.o src/lib66/resolve/resolve_free.o src/lib66/resolve/resolve_get_field_tosa.o src/lib66/resolve/resolve_get_field_tosa_g.o src/lib66/resolve/resolve_init.o src/lib66/resolve/resolve_modify_field.o src/lib66/resolve/resolve_modify_field_g.o src/lib66/resolve/resolve_read.o src/lib66/resolve/resolve_read_cdb.o src/lib66/resolve/resolve_read_g.o src/lib66/resolve/resolve_remove.o src/lib66/resolve/resolve_remove_g.o src/lib66/resolve/resolve_set_struct.o src/lib66/resolve/resolve_write.o src/lib66/resolve/resolve_write_cdb.o src/lib66/resolve/resolve_write_g.o src/lib66/sanitize/sanitize_fdholder.o src/lib66/sanitize/sanitize_init.o src/lib66/sanitize/sanitize_livestate.o src/lib66/sanitize/sanitize_scandir.o src/lib66/sanitize/sanitize_source.o src/lib66/sanitize/sanitize_system.o src/lib66/service/service_cmp_basedir.o src/lib66/service/service_enable_disable.o src/lib66/service/service_endof_dir.o src/lib66/service/service_frontend_path.o src/lib66/service/service_frontend_src.o src/lib66/service/service_graph_build.o src/lib66/service/service_graph_collect.o src/lib66/service/service_graph_g.o src/lib66/service/service_is_g.o src/lib66/service/service_resolve_array_free.o src/lib66/service/service_resolve_array_search.o src/lib66/service/service_resolve_copy.o src/lib66/service/service_resolve_get_field_tosa.o src/lib66/service/service_resolve_master_copy.o src/lib66/service/service_resolve_master_create.o src/lib66/service/service_resolve_master_get_field_tosa.o src/lib66/service/service_resolve_master_modify_field.o src/lib66/service/service_resolve_master_read_cdb.o src/lib66/service/service_resolve_master_write.o src/lib66/service/service_resolve_master_write_cdb.o src/lib66/service/service_resolve_modify_field.o src/lib66/service/service_resolve_read_cdb.o src/lib66/service/service_resolve_sort_bytype.o src/lib66/service/service_resolve_write.o src/lib66/service/service_resolve_write_cdb.o src/lib66/shutdown/hpr_shutdown.o src/lib66/shutdown/hpr_wall.o src/lib66/state/state_check.o src/lib66/state/state_get_flags.o src/lib66/state/state_messenger.o src/lib66/state/state_pack.o src/lib66/state/state_read.o src/lib66/state/state_rmfile.o src/lib66/state/state_set_flag.o src/lib66/state/state_unpack.o src/lib66/state/state_write.o src/lib66/svc/svc_scandir_ok.o src/lib66/svc/svc_scandir_send.o src/lib66/svc/svc_send.o src/lib66/svc/svc_send_wait.o src/lib66/svc/svc_unsupervise.o src/lib66/tree/tree_find_current.o src/lib66/tree/tree_get_permissions.o src/lib66/tree/tree_iscurrent.o src/lib66/tree/tree_isenabled.o src/lib66/tree/tree_isinitialized.o src/lib66/tree/tree_issupervised.o src/lib66/tree/tree_isvalid.o src/lib66/tree/tree_ongroups.o src/lib66/tree/tree_resolve_array_search.o src/lib66/tree/tree_resolve_copy.o src/lib66/tree/tree_resolve_get_field_tosa.o src/lib66/tree/tree_resolve_master_copy.o src/lib66/tree/tree_resolve_master_create.o src/lib66/tree/tree_resolve_master_get_field_tosa.o src/lib66/tree/tree_resolve_master_modify_field.o src/lib66/tree/tree_resolve_master_read_cdb.o src/lib66/tree/tree_resolve_master_write_cdb.o src/lib66/tree/tree_resolve_modify_field.o src/lib66/tree/tree_resolve_read_cdb.o src/lib66/tree/tree_resolve_write_cdb.o src/lib66/tree/tree_seed_file_isvalid.o src/lib66/tree/tree_seed_free.o src/lib66/tree/tree_seed_get_group_permissions.o src/lib66/tree/tree_seed_get_key.o src/lib66/tree/tree_seed_isvalid.o src/lib66/tree/tree_seed_parse_file.o src/lib66/tree/tree_seed_resolve_path.o src/lib66/tree/tree_seed_setseed.o src/lib66/tree/tree_sethome.o src/lib66/tree/tree_setname.o src/lib66/tree/tree_switch_current.o src/lib66/utils/get_userhome.o src/lib66/utils/module_in_cmdline.o src/lib66/utils/module_path.o src/lib66/utils/module_search_service.o src/lib66/utils/name_isvalid.o src/lib66/utils/read_svfile.o src/lib66/utils/set_livedir.o src/lib66/utils/set_livescan.o src/lib66/utils/set_livestate.o src/lib66/utils/set_ownerhome.o src/lib66/utils/set_ownersysdir.o src/lib66/utils/yourgid.o src/lib66/utils/youruid.o src/lib66/write/write_classic.o src/lib66/write/write_common.o src/lib66/write/write_environ.o src/lib66/write/write_execute_scripts.o src/lib66/write/write_logger.o src/lib66/write/write_oneshot.o src/lib66/write/write_service.o src/lib66/write/write_uint.o
+lib66.a.xyzzy: src/lib66/enum/enum.o src/lib66/environ/env_append_version.o src/lib66/environ/env_check_version.o src/lib66/environ/env_clean_with_comment.o src/lib66/environ/env_compute.o src/lib66/environ/env_find_current_version.o src/lib66/environ/env_import_version_file.o src/lib66/environ/env_make_symlink.o src/lib66/environ/env_prepare_for_write.o src/lib66/environ/env_resolve_conf.o src/lib66/exec/ssexec_boot.o src/lib66/exec/ssexec_copy.o src/lib66/exec/ssexec_disable.o src/lib66/exec/ssexec_enable.o src/lib66/exec/ssexec_env.o src/lib66/exec/ssexec_free.o src/lib66/exec/ssexec_help.o src/lib66/exec/ssexec_init.o src/lib66/exec/ssexec_parse.o src/lib66/exec/ssexec_reconfigure.o src/lib66/exec/ssexec_reload.o src/lib66/exec/ssexec_restart.o src/lib66/exec/ssexec_scanctl.o src/lib66/exec/ssexec_scandir.o src/lib66/exec/ssexec_service_admin.o src/lib66/exec/ssexec_service_resolve.o src/lib66/exec/ssexec_service_signal.o src/lib66/exec/ssexec_service_state.o src/lib66/exec/ssexec_service_status.o src/lib66/exec/ssexec_service_wrapper.o src/lib66/exec/ssexec_start.o src/lib66/exec/ssexec_stop.o src/lib66/exec/ssexec_tree_admin.o src/lib66/exec/ssexec_tree_resolve.o src/lib66/exec/ssexec_tree_signal.o src/lib66/exec/ssexec_tree_status.o src/lib66/exec/ssexec_tree_wrapper.o src/lib66/graph/graph_build_service.o src/lib66/graph/graph_build_service_bytree.o src/lib66/graph/graph_build_service_bytree_from_src.o src/lib66/graph/graph_build_service_from_sastr.o src/lib66/graph/graph_build_tree.o src/lib66/graph/graph_compute_dependencies.o src/lib66/graph/graph_remove_deps.o src/lib66/info/info_display_field_name.o src/lib66/info/info_display_list.o src/lib66/info/info_display_nline.o src/lib66/info/info_field_align.o src/lib66/info/info_getcols_fd.o src/lib66/info/info_graph_display.o src/lib66/info/info_graph_display_service.o src/lib66/info/info_graph_display_tree.o src/lib66/info/info_graph_init.o src/lib66/info/info_length_from_wchar.o src/lib66/info/info_walk.o src/lib66/instance/instance_check.o src/lib66/instance/instance_create.o src/lib66/instance/instance_splitname.o src/lib66/parse/parse_clean_line.o src/lib66/parse/parse_clean_list.o src/lib66/parse/parse_clean_quotes.o src/lib66/parse/parse_clean_runas.o src/lib66/parse/parse_compute_list.o src/lib66/parse/parse_compute_resolve.o src/lib66/parse/parse_contents.o src/lib66/parse/parse_dependencies.o src/lib66/parse/parse_error.o src/lib66/parse/parse_frontend.o src/lib66/parse/parse_line_g.o src/lib66/parse/parse_mandatory.o src/lib66/parse/parse_module.o src/lib66/parse/parse_parentheses.o src/lib66/parse/parse_section.o src/lib66/parse/parse_service.o src/lib66/parse/parse_split_from_section.o src/lib66/parse/parse_store_environ.o src/lib66/parse/parse_store_g.o src/lib66/parse/parse_store_logger.o src/lib66/parse/parse_store_main.o src/lib66/parse/parse_store_regex.o src/lib66/parse/parse_store_start_stop.o src/lib66/resolve/resolve_add_cdb.o src/lib66/resolve/resolve_add_cdb_uint.o src/lib66/resolve/resolve_add_string.o src/lib66/resolve/resolve_check.o src/lib66/resolve/resolve_check_g.o src/lib66/resolve/resolve_find_cdb.o src/lib66/resolve/resolve_free.o src/lib66/resolve/resolve_get_field_tosa.o src/lib66/resolve/resolve_get_field_tosa_g.o src/lib66/resolve/resolve_init.o src/lib66/resolve/resolve_modify_field.o src/lib66/resolve/resolve_modify_field_g.o src/lib66/resolve/resolve_read.o src/lib66/resolve/resolve_read_cdb.o src/lib66/resolve/resolve_read_g.o src/lib66/resolve/resolve_remove.o src/lib66/resolve/resolve_remove_g.o src/lib66/resolve/resolve_set_struct.o src/lib66/resolve/resolve_write.o src/lib66/resolve/resolve_write_cdb.o src/lib66/resolve/resolve_write_g.o src/lib66/sanitize/sanitize_fdholder.o src/lib66/sanitize/sanitize_init.o src/lib66/sanitize/sanitize_livestate.o src/lib66/sanitize/sanitize_scandir.o src/lib66/sanitize/sanitize_source.o src/lib66/sanitize/sanitize_system.o src/lib66/service/service_cmp_basedir.o src/lib66/service/service_enable_disable.o src/lib66/service/service_endof_dir.o src/lib66/service/service_frontend_path.o src/lib66/service/service_frontend_src.o src/lib66/service/service_graph_build.o src/lib66/service/service_graph_collect.o src/lib66/service/service_graph_g.o src/lib66/service/service_is_g.o src/lib66/service/service_resolve_array_free.o src/lib66/service/service_resolve_array_search.o src/lib66/service/service_resolve_copy.o src/lib66/service/service_resolve_get_field_tosa.o src/lib66/service/service_resolve_master_copy.o src/lib66/service/service_resolve_master_create.o src/lib66/service/service_resolve_master_get_field_tosa.o src/lib66/service/service_resolve_master_modify_field.o src/lib66/service/service_resolve_master_read_cdb.o src/lib66/service/service_resolve_master_write.o src/lib66/service/service_resolve_master_write_cdb.o src/lib66/service/service_resolve_modify_field.o src/lib66/service/service_resolve_read_cdb.o src/lib66/service/service_resolve_sort_bytype.o src/lib66/service/service_resolve_write.o src/lib66/service/service_resolve_write_cdb.o src/lib66/shutdown/hpr_shutdown.o src/lib66/shutdown/hpr_wall.o src/lib66/state/state_check.o src/lib66/state/state_get_flags.o src/lib66/state/state_messenger.o src/lib66/state/state_pack.o src/lib66/state/state_read.o src/lib66/state/state_rmfile.o src/lib66/state/state_set_flag.o src/lib66/state/state_unpack.o src/lib66/state/state_write.o src/lib66/svc/svc_scandir_ok.o src/lib66/svc/svc_scandir_send.o src/lib66/svc/svc_send.o src/lib66/svc/svc_send_wait.o src/lib66/svc/svc_unsupervise.o src/lib66/tree/tree_find_current.o src/lib66/tree/tree_get_permissions.o src/lib66/tree/tree_iscurrent.o src/lib66/tree/tree_isenabled.o src/lib66/tree/tree_isinitialized.o src/lib66/tree/tree_issupervised.o src/lib66/tree/tree_isvalid.o src/lib66/tree/tree_ongroups.o src/lib66/tree/tree_resolve_array_search.o src/lib66/tree/tree_resolve_copy.o src/lib66/tree/tree_resolve_get_field_tosa.o src/lib66/tree/tree_resolve_master_copy.o src/lib66/tree/tree_resolve_master_create.o src/lib66/tree/tree_resolve_master_get_field_tosa.o src/lib66/tree/tree_resolve_master_modify_field.o src/lib66/tree/tree_resolve_master_read_cdb.o src/lib66/tree/tree_resolve_master_write_cdb.o src/lib66/tree/tree_resolve_modify_field.o src/lib66/tree/tree_resolve_read_cdb.o src/lib66/tree/tree_resolve_write_cdb.o src/lib66/tree/tree_seed_file_isvalid.o src/lib66/tree/tree_seed_free.o src/lib66/tree/tree_seed_get_group_permissions.o src/lib66/tree/tree_seed_get_key.o src/lib66/tree/tree_seed_isvalid.o src/lib66/tree/tree_seed_parse_file.o src/lib66/tree/tree_seed_resolve_path.o src/lib66/tree/tree_seed_setseed.o src/lib66/tree/tree_sethome.o src/lib66/tree/tree_setname.o src/lib66/tree/tree_switch_current.o src/lib66/utils/get_userhome.o src/lib66/utils/module_in_cmdline.o src/lib66/utils/module_path.o src/lib66/utils/module_search_service.o src/lib66/utils/name_isvalid.o src/lib66/utils/read_svfile.o src/lib66/utils/set_livedir.o src/lib66/utils/set_livescan.o src/lib66/utils/set_livestate.o src/lib66/utils/set_ownerhome.o src/lib66/utils/set_ownersysdir.o src/lib66/utils/yourgid.o src/lib66/utils/youruid.o src/lib66/write/write_classic.o src/lib66/write/write_common.o src/lib66/write/write_environ.o src/lib66/write/write_execute_scripts.o src/lib66/write/write_logger.o src/lib66/write/write_oneshot.o src/lib66/write/write_service.o src/lib66/write/write_uint.o
else
-lib66.a.xyzzy: src/lib66/enum/enum.lo src/lib66/environ/env_append_version.lo src/lib66/environ/env_check_version.lo src/lib66/environ/env_clean_with_comment.lo src/lib66/environ/env_compute.lo src/lib66/environ/env_find_current_version.lo src/lib66/environ/env_import_version_file.lo src/lib66/environ/env_make_symlink.lo src/lib66/environ/env_prepare_for_write.lo src/lib66/environ/env_resolve_conf.lo src/lib66/exec/ssexec_boot.lo src/lib66/exec/ssexec_copy.lo src/lib66/exec/ssexec_disable.lo src/lib66/exec/ssexec_enable.lo src/lib66/exec/ssexec_env.lo src/lib66/exec/ssexec_free.lo src/lib66/exec/ssexec_help.lo src/lib66/exec/ssexec_init.lo src/lib66/exec/ssexec_inservice.lo src/lib66/exec/ssexec_instate.lo src/lib66/exec/ssexec_intree.lo src/lib66/exec/ssexec_parse.lo src/lib66/exec/ssexec_reconfigure.lo src/lib66/exec/ssexec_reload.lo src/lib66/exec/ssexec_resolve_service.lo src/lib66/exec/ssexec_resolve_tree.lo src/lib66/exec/ssexec_restart.lo src/lib66/exec/ssexec_scanctl.lo src/lib66/exec/ssexec_scandir.lo src/lib66/exec/ssexec_service_wrapper.lo src/lib66/exec/ssexec_start.lo src/lib66/exec/ssexec_stop.lo src/lib66/exec/ssexec_svctl.lo src/lib66/exec/ssexec_tree.lo src/lib66/exec/ssexec_treectl.lo src/lib66/exec/ssexec_service_admin.lo src/lib66/exec/ssexec_tree_wrapper.lo src/lib66/graph/graph_build_service.lo src/lib66/graph/graph_build_service_bytree.lo src/lib66/graph/graph_build_service_bytree_from_src.lo src/lib66/graph/graph_build_service_from_sastr.lo src/lib66/graph/graph_build_tree.lo src/lib66/graph/graph_compute_dependencies.lo src/lib66/graph/graph_remove_deps.lo src/lib66/info/info_display_field_name.lo src/lib66/info/info_display_list.lo src/lib66/info/info_display_nline.lo src/lib66/info/info_field_align.lo src/lib66/info/info_getcols_fd.lo src/lib66/info/info_graph_display.lo src/lib66/info/info_graph_display_service.lo src/lib66/info/info_graph_display_tree.lo src/lib66/info/info_graph_init.lo src/lib66/info/info_length_from_wchar.lo src/lib66/info/info_walk.lo src/lib66/instance/instance_check.lo src/lib66/instance/instance_create.lo src/lib66/instance/instance_splitname.lo src/lib66/parse/parse_clean_line.lo src/lib66/parse/parse_clean_list.lo src/lib66/parse/parse_clean_quotes.lo src/lib66/parse/parse_clean_runas.lo src/lib66/parse/parse_compute_list.lo src/lib66/parse/parse_compute_resolve.lo src/lib66/parse/parse_contents.lo src/lib66/parse/parse_dependencies.lo src/lib66/parse/parse_error.lo src/lib66/parse/parse_frontend.lo src/lib66/parse/parse_line_g.lo src/lib66/parse/parse_mandatory.lo src/lib66/parse/parse_module.lo src/lib66/parse/parse_parentheses.lo src/lib66/parse/parse_section.lo src/lib66/parse/parse_service.lo src/lib66/parse/parse_split_from_section.lo src/lib66/parse/parse_store_environ.lo src/lib66/parse/parse_store_g.lo src/lib66/parse/parse_store_logger.lo src/lib66/parse/parse_store_main.lo src/lib66/parse/parse_store_regex.lo src/lib66/parse/parse_store_start_stop.lo src/lib66/resolve/resolve_add_cdb.lo src/lib66/resolve/resolve_add_cdb_uint.lo src/lib66/resolve/resolve_add_string.lo src/lib66/resolve/resolve_check.lo src/lib66/resolve/resolve_check_g.lo src/lib66/resolve/resolve_find_cdb.lo src/lib66/resolve/resolve_free.lo src/lib66/resolve/resolve_get_field_tosa.lo src/lib66/resolve/resolve_get_field_tosa_g.lo src/lib66/resolve/resolve_init.lo src/lib66/resolve/resolve_modify_field.lo src/lib66/resolve/resolve_modify_field_g.lo src/lib66/resolve/resolve_read.lo src/lib66/resolve/resolve_read_cdb.lo src/lib66/resolve/resolve_read_g.lo src/lib66/resolve/resolve_remove.lo src/lib66/resolve/resolve_remove_g.lo src/lib66/resolve/resolve_set_struct.lo src/lib66/resolve/resolve_write.lo src/lib66/resolve/resolve_write_cdb.lo src/lib66/resolve/resolve_write_g.lo src/lib66/sanitize/sanitize_fdholder.lo src/lib66/sanitize/sanitize_init.lo src/lib66/sanitize/sanitize_livestate.lo src/lib66/sanitize/sanitize_scandir.lo src/lib66/sanitize/sanitize_source.lo src/lib66/sanitize/sanitize_system.lo src/lib66/service/service_cmp_basedir.lo src/lib66/service/service_enable_disable.lo src/lib66/service/service_endof_dir.lo src/lib66/service/service_frontend_path.lo src/lib66/service/service_frontend_src.lo src/lib66/service/service_graph_build.lo src/lib66/service/service_graph_collect.lo src/lib66/service/service_graph_g.lo src/lib66/service/service_is_g.lo src/lib66/service/service_resolve_array_free.lo src/lib66/service/service_resolve_array_search.lo src/lib66/service/service_resolve_copy.lo src/lib66/service/service_resolve_get_field_tosa.lo src/lib66/service/service_resolve_master_copy.lo src/lib66/service/service_resolve_master_create.lo src/lib66/service/service_resolve_master_get_field_tosa.lo src/lib66/service/service_resolve_master_modify_field.lo src/lib66/service/service_resolve_master_read_cdb.lo src/lib66/service/service_resolve_master_write.lo src/lib66/service/service_resolve_master_write_cdb.lo src/lib66/service/service_resolve_modify_field.lo src/lib66/service/service_resolve_read_cdb.lo src/lib66/service/service_resolve_sort_bytype.lo src/lib66/service/service_resolve_write.lo src/lib66/service/service_resolve_write_cdb.lo src/lib66/shutdown/hpr_shutdown.lo src/lib66/shutdown/hpr_wall.lo src/lib66/state/state_check.lo src/lib66/state/state_get_flags.lo src/lib66/state/state_messenger.lo src/lib66/state/state_pack.lo src/lib66/state/state_read.lo src/lib66/state/state_rmfile.lo src/lib66/state/state_set_flag.lo src/lib66/state/state_unpack.lo src/lib66/state/state_write.lo src/lib66/svc/svc_scandir_ok.lo src/lib66/svc/svc_scandir_send.lo src/lib66/svc/svc_send.lo src/lib66/svc/svc_send_wait.lo src/lib66/svc/svc_unsupervise.lo src/lib66/tree/tree_find_current.lo src/lib66/tree/tree_get_permissions.lo src/lib66/tree/tree_iscurrent.lo src/lib66/tree/tree_isenabled.lo src/lib66/tree/tree_isinitialized.lo src/lib66/tree/tree_issupervised.lo src/lib66/tree/tree_isvalid.lo src/lib66/tree/tree_ongroups.lo src/lib66/tree/tree_resolve_array_search.lo src/lib66/tree/tree_resolve_copy.lo src/lib66/tree/tree_resolve_get_field_tosa.lo src/lib66/tree/tree_resolve_master_copy.lo src/lib66/tree/tree_resolve_master_create.lo src/lib66/tree/tree_resolve_master_get_field_tosa.lo src/lib66/tree/tree_resolve_master_modify_field.lo src/lib66/tree/tree_resolve_master_read_cdb.lo src/lib66/tree/tree_resolve_master_write_cdb.lo src/lib66/tree/tree_resolve_modify_field.lo src/lib66/tree/tree_resolve_read_cdb.lo src/lib66/tree/tree_resolve_write_cdb.lo src/lib66/tree/tree_seed_file_isvalid.lo src/lib66/tree/tree_seed_free.lo src/lib66/tree/tree_seed_get_group_permissions.lo src/lib66/tree/tree_seed_get_key.lo src/lib66/tree/tree_seed_isvalid.lo src/lib66/tree/tree_seed_parse_file.lo src/lib66/tree/tree_seed_resolve_path.lo src/lib66/tree/tree_seed_setseed.lo src/lib66/tree/tree_sethome.lo src/lib66/tree/tree_setname.lo src/lib66/tree/tree_switch_current.lo src/lib66/utils/get_userhome.lo src/lib66/utils/module_in_cmdline.lo src/lib66/utils/module_path.lo src/lib66/utils/module_search_service.lo src/lib66/utils/name_isvalid.lo src/lib66/utils/read_svfile.lo src/lib66/utils/set_livedir.lo src/lib66/utils/set_livescan.lo src/lib66/utils/set_livestate.lo src/lib66/utils/set_ownerhome.lo src/lib66/utils/set_ownersysdir.lo src/lib66/utils/yourgid.lo src/lib66/utils/youruid.lo src/lib66/write/write_classic.lo src/lib66/write/write_common.lo src/lib66/write/write_environ.lo src/lib66/write/write_execute_scripts.lo src/lib66/write/write_logger.lo src/lib66/write/write_oneshot.lo src/lib66/write/write_service.lo src/lib66/write/write_uint.lo
+lib66.a.xyzzy: src/lib66/enum/enum.lo src/lib66/environ/env_append_version.lo src/lib66/environ/env_check_version.lo src/lib66/environ/env_clean_with_comment.lo src/lib66/environ/env_compute.lo src/lib66/environ/env_find_current_version.lo src/lib66/environ/env_import_version_file.lo src/lib66/environ/env_make_symlink.lo src/lib66/environ/env_prepare_for_write.lo src/lib66/environ/env_resolve_conf.lo src/lib66/exec/ssexec_boot.lo src/lib66/exec/ssexec_copy.lo src/lib66/exec/ssexec_disable.lo src/lib66/exec/ssexec_enable.lo src/lib66/exec/ssexec_env.lo src/lib66/exec/ssexec_free.lo src/lib66/exec/ssexec_help.lo src/lib66/exec/ssexec_init.lo src/lib66/exec/ssexec_parse.lo src/lib66/exec/ssexec_reconfigure.lo src/lib66/exec/ssexec_reload.lo src/lib66/exec/ssexec_restart.lo src/lib66/exec/ssexec_scanctl.lo src/lib66/exec/ssexec_scandir.lo src/lib66/exec/ssexec_service_admin.lo src/lib66/exec/ssexec_service_resolve.lo src/lib66/exec/ssexec_service_signal.lo src/lib66/exec/ssexec_service_state.lo src/lib66/exec/ssexec_service_status.lo src/lib66/exec/ssexec_service_wrapper.lo src/lib66/exec/ssexec_start.lo src/lib66/exec/ssexec_stop.lo src/lib66/exec/ssexec_tree_admin.lo src/lib66/exec/ssexec_tree_resolve.lo src/lib66/exec/ssexec_tree_signal.lo src/lib66/exec/ssexec_tree_status.lo src/lib66/exec/ssexec_tree_wrapper.lo src/lib66/graph/graph_build_service.lo src/lib66/graph/graph_build_service_bytree.lo src/lib66/graph/graph_build_service_bytree_from_src.lo src/lib66/graph/graph_build_service_from_sastr.lo src/lib66/graph/graph_build_tree.lo src/lib66/graph/graph_compute_dependencies.lo src/lib66/graph/graph_remove_deps.lo src/lib66/info/info_display_field_name.lo src/lib66/info/info_display_list.lo src/lib66/info/info_display_nline.lo src/lib66/info/info_field_align.lo src/lib66/info/info_getcols_fd.lo src/lib66/info/info_graph_display.lo src/lib66/info/info_graph_display_service.lo src/lib66/info/info_graph_display_tree.lo src/lib66/info/info_graph_init.lo src/lib66/info/info_length_from_wchar.lo src/lib66/info/info_walk.lo src/lib66/instance/instance_check.lo src/lib66/instance/instance_create.lo src/lib66/instance/instance_splitname.lo src/lib66/parse/parse_clean_line.lo src/lib66/parse/parse_clean_list.lo src/lib66/parse/parse_clean_quotes.lo src/lib66/parse/parse_clean_runas.lo src/lib66/parse/parse_compute_list.lo src/lib66/parse/parse_compute_resolve.lo src/lib66/parse/parse_contents.lo src/lib66/parse/parse_dependencies.lo src/lib66/parse/parse_error.lo src/lib66/parse/parse_frontend.lo src/lib66/parse/parse_line_g.lo src/lib66/parse/parse_mandatory.lo src/lib66/parse/parse_module.lo src/lib66/parse/parse_parentheses.lo src/lib66/parse/parse_section.lo src/lib66/parse/parse_service.lo src/lib66/parse/parse_split_from_section.lo src/lib66/parse/parse_store_environ.lo src/lib66/parse/parse_store_g.lo src/lib66/parse/parse_store_logger.lo src/lib66/parse/parse_store_main.lo src/lib66/parse/parse_store_regex.lo src/lib66/parse/parse_store_start_stop.lo src/lib66/resolve/resolve_add_cdb.lo src/lib66/resolve/resolve_add_cdb_uint.lo src/lib66/resolve/resolve_add_string.lo src/lib66/resolve/resolve_check.lo src/lib66/resolve/resolve_check_g.lo src/lib66/resolve/resolve_find_cdb.lo src/lib66/resolve/resolve_free.lo src/lib66/resolve/resolve_get_field_tosa.lo src/lib66/resolve/resolve_get_field_tosa_g.lo src/lib66/resolve/resolve_init.lo src/lib66/resolve/resolve_modify_field.lo src/lib66/resolve/resolve_modify_field_g.lo src/lib66/resolve/resolve_read.lo src/lib66/resolve/resolve_read_cdb.lo src/lib66/resolve/resolve_read_g.lo src/lib66/resolve/resolve_remove.lo src/lib66/resolve/resolve_remove_g.lo src/lib66/resolve/resolve_set_struct.lo src/lib66/resolve/resolve_write.lo src/lib66/resolve/resolve_write_cdb.lo src/lib66/resolve/resolve_write_g.lo src/lib66/sanitize/sanitize_fdholder.lo src/lib66/sanitize/sanitize_init.lo src/lib66/sanitize/sanitize_livestate.lo src/lib66/sanitize/sanitize_scandir.lo src/lib66/sanitize/sanitize_source.lo src/lib66/sanitize/sanitize_system.lo src/lib66/service/service_cmp_basedir.lo src/lib66/service/service_enable_disable.lo src/lib66/service/service_endof_dir.lo src/lib66/service/service_frontend_path.lo src/lib66/service/service_frontend_src.lo src/lib66/service/service_graph_build.lo src/lib66/service/service_graph_collect.lo src/lib66/service/service_graph_g.lo src/lib66/service/service_is_g.lo src/lib66/service/service_resolve_array_free.lo src/lib66/service/service_resolve_array_search.lo src/lib66/service/service_resolve_copy.lo src/lib66/service/service_resolve_get_field_tosa.lo src/lib66/service/service_resolve_master_copy.lo src/lib66/service/service_resolve_master_create.lo src/lib66/service/service_resolve_master_get_field_tosa.lo src/lib66/service/service_resolve_master_modify_field.lo src/lib66/service/service_resolve_master_read_cdb.lo src/lib66/service/service_resolve_master_write.lo src/lib66/service/service_resolve_master_write_cdb.lo src/lib66/service/service_resolve_modify_field.lo src/lib66/service/service_resolve_read_cdb.lo src/lib66/service/service_resolve_sort_bytype.lo src/lib66/service/service_resolve_write.lo src/lib66/service/service_resolve_write_cdb.lo src/lib66/shutdown/hpr_shutdown.lo src/lib66/shutdown/hpr_wall.lo src/lib66/state/state_check.lo src/lib66/state/state_get_flags.lo src/lib66/state/state_messenger.lo src/lib66/state/state_pack.lo src/lib66/state/state_read.lo src/lib66/state/state_rmfile.lo src/lib66/state/state_set_flag.lo src/lib66/state/state_unpack.lo src/lib66/state/state_write.lo src/lib66/svc/svc_scandir_ok.lo src/lib66/svc/svc_scandir_send.lo src/lib66/svc/svc_send.lo src/lib66/svc/svc_send_wait.lo src/lib66/svc/svc_unsupervise.lo src/lib66/tree/tree_find_current.lo src/lib66/tree/tree_get_permissions.lo src/lib66/tree/tree_iscurrent.lo src/lib66/tree/tree_isenabled.lo src/lib66/tree/tree_isinitialized.lo src/lib66/tree/tree_issupervised.lo src/lib66/tree/tree_isvalid.lo src/lib66/tree/tree_ongroups.lo src/lib66/tree/tree_resolve_array_search.lo src/lib66/tree/tree_resolve_copy.lo src/lib66/tree/tree_resolve_get_field_tosa.lo src/lib66/tree/tree_resolve_master_copy.lo src/lib66/tree/tree_resolve_master_create.lo src/lib66/tree/tree_resolve_master_get_field_tosa.lo src/lib66/tree/tree_resolve_master_modify_field.lo src/lib66/tree/tree_resolve_master_read_cdb.lo src/lib66/tree/tree_resolve_master_write_cdb.lo src/lib66/tree/tree_resolve_modify_field.lo src/lib66/tree/tree_resolve_read_cdb.lo src/lib66/tree/tree_resolve_write_cdb.lo src/lib66/tree/tree_seed_file_isvalid.lo src/lib66/tree/tree_seed_free.lo src/lib66/tree/tree_seed_get_group_permissions.lo src/lib66/tree/tree_seed_get_key.lo src/lib66/tree/tree_seed_isvalid.lo src/lib66/tree/tree_seed_parse_file.lo src/lib66/tree/tree_seed_resolve_path.lo src/lib66/tree/tree_seed_setseed.lo src/lib66/tree/tree_sethome.lo src/lib66/tree/tree_setname.lo src/lib66/tree/tree_switch_current.lo src/lib66/utils/get_userhome.lo src/lib66/utils/module_in_cmdline.lo src/lib66/utils/module_path.lo src/lib66/utils/module_search_service.lo src/lib66/utils/name_isvalid.lo src/lib66/utils/read_svfile.lo src/lib66/utils/set_livedir.lo src/lib66/utils/set_livescan.lo src/lib66/utils/set_livestate.lo src/lib66/utils/set_ownerhome.lo src/lib66/utils/set_ownersysdir.lo src/lib66/utils/yourgid.lo src/lib66/utils/youruid.lo src/lib66/write/write_classic.lo src/lib66/write/write_common.lo src/lib66/write/write_environ.lo src/lib66/write/write_execute_scripts.lo src/lib66/write/write_logger.lo src/lib66/write/write_oneshot.lo src/lib66/write/write_service.lo src/lib66/write/write_uint.lo
endif
lib66.so.xyzzy: EXTRA_LIBS := -loblibs -lskarnet -ls6 -lexecline
-lib66.so.xyzzy: src/lib66/enum/enum.lo src/lib66/environ/env_append_version.lo src/lib66/environ/env_check_version.lo src/lib66/environ/env_clean_with_comment.lo src/lib66/environ/env_compute.lo src/lib66/environ/env_find_current_version.lo src/lib66/environ/env_import_version_file.lo src/lib66/environ/env_make_symlink.lo src/lib66/environ/env_prepare_for_write.lo src/lib66/environ/env_resolve_conf.lo src/lib66/exec/ssexec_boot.lo src/lib66/exec/ssexec_copy.lo src/lib66/exec/ssexec_disable.lo src/lib66/exec/ssexec_enable.lo src/lib66/exec/ssexec_env.lo src/lib66/exec/ssexec_free.lo src/lib66/exec/ssexec_help.lo src/lib66/exec/ssexec_init.lo src/lib66/exec/ssexec_inservice.lo src/lib66/exec/ssexec_instate.lo src/lib66/exec/ssexec_intree.lo src/lib66/exec/ssexec_parse.lo src/lib66/exec/ssexec_reconfigure.lo src/lib66/exec/ssexec_reload.lo src/lib66/exec/ssexec_resolve_service.lo src/lib66/exec/ssexec_resolve_tree.lo src/lib66/exec/ssexec_restart.lo src/lib66/exec/ssexec_scanctl.lo src/lib66/exec/ssexec_scandir.lo src/lib66/exec/ssexec_service_wrapper.lo src/lib66/exec/ssexec_start.lo src/lib66/exec/ssexec_stop.lo src/lib66/exec/ssexec_svctl.lo src/lib66/exec/ssexec_tree.lo src/lib66/exec/ssexec_treectl.lo src/lib66/exec/ssexec_service_admin.lo src/lib66/exec/ssexec_tree_wrapper.lo src/lib66/graph/graph_build_service.lo src/lib66/graph/graph_build_service_bytree.lo src/lib66/graph/graph_build_service_bytree_from_src.lo src/lib66/graph/graph_build_service_from_sastr.lo src/lib66/graph/graph_build_tree.lo src/lib66/graph/graph_compute_dependencies.lo src/lib66/graph/graph_remove_deps.lo src/lib66/info/info_display_field_name.lo src/lib66/info/info_display_list.lo src/lib66/info/info_display_nline.lo src/lib66/info/info_field_align.lo src/lib66/info/info_getcols_fd.lo src/lib66/info/info_graph_display.lo src/lib66/info/info_graph_display_service.lo src/lib66/info/info_graph_display_tree.lo src/lib66/info/info_graph_init.lo src/lib66/info/info_length_from_wchar.lo src/lib66/info/info_walk.lo src/lib66/instance/instance_check.lo src/lib66/instance/instance_create.lo src/lib66/instance/instance_splitname.lo src/lib66/parse/parse_clean_line.lo src/lib66/parse/parse_clean_list.lo src/lib66/parse/parse_clean_quotes.lo src/lib66/parse/parse_clean_runas.lo src/lib66/parse/parse_compute_list.lo src/lib66/parse/parse_compute_resolve.lo src/lib66/parse/parse_contents.lo src/lib66/parse/parse_dependencies.lo src/lib66/parse/parse_error.lo src/lib66/parse/parse_frontend.lo src/lib66/parse/parse_line_g.lo src/lib66/parse/parse_mandatory.lo src/lib66/parse/parse_module.lo src/lib66/parse/parse_parentheses.lo src/lib66/parse/parse_section.lo src/lib66/parse/parse_service.lo src/lib66/parse/parse_split_from_section.lo src/lib66/parse/parse_store_environ.lo src/lib66/parse/parse_store_g.lo src/lib66/parse/parse_store_logger.lo src/lib66/parse/parse_store_main.lo src/lib66/parse/parse_store_regex.lo src/lib66/parse/parse_store_start_stop.lo src/lib66/resolve/resolve_add_cdb.lo src/lib66/resolve/resolve_add_cdb_uint.lo src/lib66/resolve/resolve_add_string.lo src/lib66/resolve/resolve_check.lo src/lib66/resolve/resolve_check_g.lo src/lib66/resolve/resolve_find_cdb.lo src/lib66/resolve/resolve_free.lo src/lib66/resolve/resolve_get_field_tosa.lo src/lib66/resolve/resolve_get_field_tosa_g.lo src/lib66/resolve/resolve_init.lo src/lib66/resolve/resolve_modify_field.lo src/lib66/resolve/resolve_modify_field_g.lo src/lib66/resolve/resolve_read.lo src/lib66/resolve/resolve_read_cdb.lo src/lib66/resolve/resolve_read_g.lo src/lib66/resolve/resolve_remove.lo src/lib66/resolve/resolve_remove_g.lo src/lib66/resolve/resolve_set_struct.lo src/lib66/resolve/resolve_write.lo src/lib66/resolve/resolve_write_cdb.lo src/lib66/resolve/resolve_write_g.lo src/lib66/sanitize/sanitize_fdholder.lo src/lib66/sanitize/sanitize_init.lo src/lib66/sanitize/sanitize_livestate.lo src/lib66/sanitize/sanitize_scandir.lo src/lib66/sanitize/sanitize_source.lo src/lib66/sanitize/sanitize_system.lo src/lib66/service/service_cmp_basedir.lo src/lib66/service/service_enable_disable.lo src/lib66/service/service_endof_dir.lo src/lib66/service/service_frontend_path.lo src/lib66/service/service_frontend_src.lo src/lib66/service/service_graph_build.lo src/lib66/service/service_graph_collect.lo src/lib66/service/service_graph_g.lo src/lib66/service/service_is_g.lo src/lib66/service/service_resolve_array_free.lo src/lib66/service/service_resolve_array_search.lo src/lib66/service/service_resolve_copy.lo src/lib66/service/service_resolve_get_field_tosa.lo src/lib66/service/service_resolve_master_copy.lo src/lib66/service/service_resolve_master_create.lo src/lib66/service/service_resolve_master_get_field_tosa.lo src/lib66/service/service_resolve_master_modify_field.lo src/lib66/service/service_resolve_master_read_cdb.lo src/lib66/service/service_resolve_master_write.lo src/lib66/service/service_resolve_master_write_cdb.lo src/lib66/service/service_resolve_modify_field.lo src/lib66/service/service_resolve_read_cdb.lo src/lib66/service/service_resolve_sort_bytype.lo src/lib66/service/service_resolve_write.lo src/lib66/service/service_resolve_write_cdb.lo src/lib66/shutdown/hpr_shutdown.lo src/lib66/shutdown/hpr_wall.lo src/lib66/state/state_check.lo src/lib66/state/state_get_flags.lo src/lib66/state/state_messenger.lo src/lib66/state/state_pack.lo src/lib66/state/state_read.lo src/lib66/state/state_rmfile.lo src/lib66/state/state_set_flag.lo src/lib66/state/state_unpack.lo src/lib66/state/state_write.lo src/lib66/svc/svc_scandir_ok.lo src/lib66/svc/svc_scandir_send.lo src/lib66/svc/svc_send.lo src/lib66/svc/svc_send_wait.lo src/lib66/svc/svc_unsupervise.lo src/lib66/tree/tree_find_current.lo src/lib66/tree/tree_get_permissions.lo src/lib66/tree/tree_iscurrent.lo src/lib66/tree/tree_isenabled.lo src/lib66/tree/tree_isinitialized.lo src/lib66/tree/tree_issupervised.lo src/lib66/tree/tree_isvalid.lo src/lib66/tree/tree_ongroups.lo src/lib66/tree/tree_resolve_array_search.lo src/lib66/tree/tree_resolve_copy.lo src/lib66/tree/tree_resolve_get_field_tosa.lo src/lib66/tree/tree_resolve_master_copy.lo src/lib66/tree/tree_resolve_master_create.lo src/lib66/tree/tree_resolve_master_get_field_tosa.lo src/lib66/tree/tree_resolve_master_modify_field.lo src/lib66/tree/tree_resolve_master_read_cdb.lo src/lib66/tree/tree_resolve_master_write_cdb.lo src/lib66/tree/tree_resolve_modify_field.lo src/lib66/tree/tree_resolve_read_cdb.lo src/lib66/tree/tree_resolve_write_cdb.lo src/lib66/tree/tree_seed_file_isvalid.lo src/lib66/tree/tree_seed_free.lo src/lib66/tree/tree_seed_get_group_permissions.lo src/lib66/tree/tree_seed_get_key.lo src/lib66/tree/tree_seed_isvalid.lo src/lib66/tree/tree_seed_parse_file.lo src/lib66/tree/tree_seed_resolve_path.lo src/lib66/tree/tree_seed_setseed.lo src/lib66/tree/tree_sethome.lo src/lib66/tree/tree_setname.lo src/lib66/tree/tree_switch_current.lo src/lib66/utils/get_userhome.lo src/lib66/utils/module_in_cmdline.lo src/lib66/utils/module_path.lo src/lib66/utils/module_search_service.lo src/lib66/utils/name_isvalid.lo src/lib66/utils/read_svfile.lo src/lib66/utils/set_livedir.lo src/lib66/utils/set_livescan.lo src/lib66/utils/set_livestate.lo src/lib66/utils/set_ownerhome.lo src/lib66/utils/set_ownersysdir.lo src/lib66/utils/yourgid.lo src/lib66/utils/youruid.lo src/lib66/write/write_classic.lo src/lib66/write/write_common.lo src/lib66/write/write_environ.lo src/lib66/write/write_execute_scripts.lo src/lib66/write/write_logger.lo src/lib66/write/write_oneshot.lo src/lib66/write/write_service.lo src/lib66/write/write_uint.lo
+lib66.so.xyzzy: src/lib66/enum/enum.lo src/lib66/environ/env_append_version.lo src/lib66/environ/env_check_version.lo src/lib66/environ/env_clean_with_comment.lo src/lib66/environ/env_compute.lo src/lib66/environ/env_find_current_version.lo src/lib66/environ/env_import_version_file.lo src/lib66/environ/env_make_symlink.lo src/lib66/environ/env_prepare_for_write.lo src/lib66/environ/env_resolve_conf.lo src/lib66/exec/ssexec_boot.lo src/lib66/exec/ssexec_copy.lo src/lib66/exec/ssexec_disable.lo src/lib66/exec/ssexec_enable.lo src/lib66/exec/ssexec_env.lo src/lib66/exec/ssexec_free.lo src/lib66/exec/ssexec_help.lo src/lib66/exec/ssexec_init.lo src/lib66/exec/ssexec_parse.lo src/lib66/exec/ssexec_reconfigure.lo src/lib66/exec/ssexec_reload.lo src/lib66/exec/ssexec_restart.lo src/lib66/exec/ssexec_scanctl.lo src/lib66/exec/ssexec_scandir.lo src/lib66/exec/ssexec_service_admin.lo src/lib66/exec/ssexec_service_resolve.lo src/lib66/exec/ssexec_service_signal.lo src/lib66/exec/ssexec_service_state.lo src/lib66/exec/ssexec_service_status.lo src/lib66/exec/ssexec_service_wrapper.lo src/lib66/exec/ssexec_start.lo src/lib66/exec/ssexec_stop.lo src/lib66/exec/ssexec_tree_admin.lo src/lib66/exec/ssexec_tree_resolve.lo src/lib66/exec/ssexec_tree_signal.lo src/lib66/exec/ssexec_tree_status.lo src/lib66/exec/ssexec_tree_wrapper.lo src/lib66/graph/graph_build_service.lo src/lib66/graph/graph_build_service_bytree.lo src/lib66/graph/graph_build_service_bytree_from_src.lo src/lib66/graph/graph_build_service_from_sastr.lo src/lib66/graph/graph_build_tree.lo src/lib66/graph/graph_compute_dependencies.lo src/lib66/graph/graph_remove_deps.lo src/lib66/info/info_display_field_name.lo src/lib66/info/info_display_list.lo src/lib66/info/info_display_nline.lo src/lib66/info/info_field_align.lo src/lib66/info/info_getcols_fd.lo src/lib66/info/info_graph_display.lo src/lib66/info/info_graph_display_service.lo src/lib66/info/info_graph_display_tree.lo src/lib66/info/info_graph_init.lo src/lib66/info/info_length_from_wchar.lo src/lib66/info/info_walk.lo src/lib66/instance/instance_check.lo src/lib66/instance/instance_create.lo src/lib66/instance/instance_splitname.lo src/lib66/parse/parse_clean_line.lo src/lib66/parse/parse_clean_list.lo src/lib66/parse/parse_clean_quotes.lo src/lib66/parse/parse_clean_runas.lo src/lib66/parse/parse_compute_list.lo src/lib66/parse/parse_compute_resolve.lo src/lib66/parse/parse_contents.lo src/lib66/parse/parse_dependencies.lo src/lib66/parse/parse_error.lo src/lib66/parse/parse_frontend.lo src/lib66/parse/parse_line_g.lo src/lib66/parse/parse_mandatory.lo src/lib66/parse/parse_module.lo src/lib66/parse/parse_parentheses.lo src/lib66/parse/parse_section.lo src/lib66/parse/parse_service.lo src/lib66/parse/parse_split_from_section.lo src/lib66/parse/parse_store_environ.lo src/lib66/parse/parse_store_g.lo src/lib66/parse/parse_store_logger.lo src/lib66/parse/parse_store_main.lo src/lib66/parse/parse_store_regex.lo src/lib66/parse/parse_store_start_stop.lo src/lib66/resolve/resolve_add_cdb.lo src/lib66/resolve/resolve_add_cdb_uint.lo src/lib66/resolve/resolve_add_string.lo src/lib66/resolve/resolve_check.lo src/lib66/resolve/resolve_check_g.lo src/lib66/resolve/resolve_find_cdb.lo src/lib66/resolve/resolve_free.lo src/lib66/resolve/resolve_get_field_tosa.lo src/lib66/resolve/resolve_get_field_tosa_g.lo src/lib66/resolve/resolve_init.lo src/lib66/resolve/resolve_modify_field.lo src/lib66/resolve/resolve_modify_field_g.lo src/lib66/resolve/resolve_read.lo src/lib66/resolve/resolve_read_cdb.lo src/lib66/resolve/resolve_read_g.lo src/lib66/resolve/resolve_remove.lo src/lib66/resolve/resolve_remove_g.lo src/lib66/resolve/resolve_set_struct.lo src/lib66/resolve/resolve_write.lo src/lib66/resolve/resolve_write_cdb.lo src/lib66/resolve/resolve_write_g.lo src/lib66/sanitize/sanitize_fdholder.lo src/lib66/sanitize/sanitize_init.lo src/lib66/sanitize/sanitize_livestate.lo src/lib66/sanitize/sanitize_scandir.lo src/lib66/sanitize/sanitize_source.lo src/lib66/sanitize/sanitize_system.lo src/lib66/service/service_cmp_basedir.lo src/lib66/service/service_enable_disable.lo src/lib66/service/service_endof_dir.lo src/lib66/service/service_frontend_path.lo src/lib66/service/service_frontend_src.lo src/lib66/service/service_graph_build.lo src/lib66/service/service_graph_collect.lo src/lib66/service/service_graph_g.lo src/lib66/service/service_is_g.lo src/lib66/service/service_resolve_array_free.lo src/lib66/service/service_resolve_array_search.lo src/lib66/service/service_resolve_copy.lo src/lib66/service/service_resolve_get_field_tosa.lo src/lib66/service/service_resolve_master_copy.lo src/lib66/service/service_resolve_master_create.lo src/lib66/service/service_resolve_master_get_field_tosa.lo src/lib66/service/service_resolve_master_modify_field.lo src/lib66/service/service_resolve_master_read_cdb.lo src/lib66/service/service_resolve_master_write.lo src/lib66/service/service_resolve_master_write_cdb.lo src/lib66/service/service_resolve_modify_field.lo src/lib66/service/service_resolve_read_cdb.lo src/lib66/service/service_resolve_sort_bytype.lo src/lib66/service/service_resolve_write.lo src/lib66/service/service_resolve_write_cdb.lo src/lib66/shutdown/hpr_shutdown.lo src/lib66/shutdown/hpr_wall.lo src/lib66/state/state_check.lo src/lib66/state/state_get_flags.lo src/lib66/state/state_messenger.lo src/lib66/state/state_pack.lo src/lib66/state/state_read.lo src/lib66/state/state_rmfile.lo src/lib66/state/state_set_flag.lo src/lib66/state/state_unpack.lo src/lib66/state/state_write.lo src/lib66/svc/svc_scandir_ok.lo src/lib66/svc/svc_scandir_send.lo src/lib66/svc/svc_send.lo src/lib66/svc/svc_send_wait.lo src/lib66/svc/svc_unsupervise.lo src/lib66/tree/tree_find_current.lo src/lib66/tree/tree_get_permissions.lo src/lib66/tree/tree_iscurrent.lo src/lib66/tree/tree_isenabled.lo src/lib66/tree/tree_isinitialized.lo src/lib66/tree/tree_issupervised.lo src/lib66/tree/tree_isvalid.lo src/lib66/tree/tree_ongroups.lo src/lib66/tree/tree_resolve_array_search.lo src/lib66/tree/tree_resolve_copy.lo src/lib66/tree/tree_resolve_get_field_tosa.lo src/lib66/tree/tree_resolve_master_copy.lo src/lib66/tree/tree_resolve_master_create.lo src/lib66/tree/tree_resolve_master_get_field_tosa.lo src/lib66/tree/tree_resolve_master_modify_field.lo src/lib66/tree/tree_resolve_master_read_cdb.lo src/lib66/tree/tree_resolve_master_write_cdb.lo src/lib66/tree/tree_resolve_modify_field.lo src/lib66/tree/tree_resolve_read_cdb.lo src/lib66/tree/tree_resolve_write_cdb.lo src/lib66/tree/tree_seed_file_isvalid.lo src/lib66/tree/tree_seed_free.lo src/lib66/tree/tree_seed_get_group_permissions.lo src/lib66/tree/tree_seed_get_key.lo src/lib66/tree/tree_seed_isvalid.lo src/lib66/tree/tree_seed_parse_file.lo src/lib66/tree/tree_seed_resolve_path.lo src/lib66/tree/tree_seed_setseed.lo src/lib66/tree/tree_sethome.lo src/lib66/tree/tree_setname.lo src/lib66/tree/tree_switch_current.lo src/lib66/utils/get_userhome.lo src/lib66/utils/module_in_cmdline.lo src/lib66/utils/module_path.lo src/lib66/utils/module_search_service.lo src/lib66/utils/name_isvalid.lo src/lib66/utils/read_svfile.lo src/lib66/utils/set_livedir.lo src/lib66/utils/set_livescan.lo src/lib66/utils/set_livestate.lo src/lib66/utils/set_ownerhome.lo src/lib66/utils/set_ownersysdir.lo src/lib66/utils/yourgid.lo src/lib66/utils/youruid.lo src/lib66/write/write_classic.lo src/lib66/write/write_common.lo src/lib66/write/write_environ.lo src/lib66/write/write_execute_scripts.lo src/lib66/write/write_logger.lo src/lib66/write/write_oneshot.lo src/lib66/write/write_service.lo src/lib66/write/write_uint.lo
diff --git a/src/66/66.c b/src/66/66.c
index 4cde3576..be6a6526 100644
--- a/src/66/66.c
+++ b/src/66/66.c
@@ -334,9 +334,9 @@ int main(int argc, char const *const *argv)
PROG = "svctl" ;
nargv[n++] = PROG ;
info.prog = PROG ;
- info.help = help_svctl ;
- info.usage = usage_svctl ;
- func = &ssexec_svctl ;
+ info.help = help_service_signal ;
+ info.usage = usage_service_signal ;
+ func = &ssexec_service_signal ;
} else if (!strcmp(argv[0], "tree")) {
diff --git a/src/include/66/ssexec.h b/src/include/66/ssexec.h
index bb5b7871..fc56003a 100644
--- a/src/include/66/ssexec.h
+++ b/src/include/66/ssexec.h
@@ -108,25 +108,29 @@ extern ssexec_func_t ssexec_enable ;
extern ssexec_func_t ssexec_disable ;
extern ssexec_func_t ssexec_start ;
extern ssexec_func_t ssexec_stop ;
-extern ssexec_func_t ssexec_svctl ;
extern ssexec_func_t ssexec_env ;
-extern ssexec_func_t ssexec_treectl ;
-extern ssexec_func_t ssexec_tree ;
extern ssexec_func_t ssexec_reconfigure ;
extern ssexec_func_t ssexec_reload ;
extern ssexec_func_t ssexec_restart ;
-extern ssexec_func_t ssexec_inresolve ;
-extern ssexec_func_t ssexec_resolve_service ;
-extern ssexec_func_t ssexec_resolve_tree ;
-extern ssexec_func_t ssexec_instate ;
-extern ssexec_func_t ssexec_intree ;
-extern ssexec_func_t ssexec_inservice ;
+/** PID1 and supervision */
extern ssexec_func_t ssexec_boot ;
extern ssexec_func_t ssexec_scanctl ;
extern ssexec_func_t ssexec_scandir ;
-extern ssexec_func_t ssexec_tree_wrapper ;
+//extern ssexec_func_t ssexec_inresolve ;
+/** service */
+extern ssexec_func_t ssexec_service_resolve ;
+extern ssexec_func_t ssexec_service_state ;
+extern ssexec_func_t ssexec_service_status ;
extern ssexec_func_t ssexec_service_wrapper ;
extern ssexec_func_t ssexec_service_admin ;
+extern ssexec_func_t ssexec_service_signal ;
+/** tree */
+extern ssexec_func_t ssexec_tree_wrapper ;
+extern ssexec_func_t ssexec_tree_signal ;
+extern ssexec_func_t ssexec_tree_admin ;
+extern ssexec_func_t ssexec_tree_status ;
+extern ssexec_func_t ssexec_tree_resolve ;
+
extern void info_help (char const *help,char const *usage) ;
@@ -169,9 +173,6 @@ extern char const *help_restart ;
extern char const *usage_unsupervise ;
extern char const *help_unsupervise ;
-extern char const *usage_svctl ;
-extern char const *help_svctl ;
-
extern char const *usage_tree_wrapper ;
extern char const *help_tree_wrapper ;
extern char const *usage_tree_create ;
@@ -207,6 +208,8 @@ extern char const *usage_service_state ;
extern char const *help_service_state ;
extern char const *usage_service_remove ;
extern char const *help_service_remove ;
+extern char const *usage_service_signal ;
+extern char const *help_service_signal ;
extern char const *usage_scanctl ;
extern char const *help_scanctl ;
diff --git a/src/lib66/exec/deps-lib/deps b/src/lib66/exec/deps-lib/deps
index 96614ae6..329b6cfa 100644
--- a/src/lib66/exec/deps-lib/deps
+++ b/src/lib66/exec/deps-lib/deps
@@ -6,24 +6,24 @@ ssexec_env.o
ssexec_free.o
ssexec_help.o
ssexec_init.o
-ssexec_inservice.o
-ssexec_instate.o
-ssexec_intree.o
ssexec_parse.o
ssexec_reconfigure.o
ssexec_reload.o
-ssexec_resolve_service.o
-ssexec_resolve_tree.o
ssexec_restart.o
ssexec_scanctl.o
ssexec_scandir.o
+ssexec_service_admin.o
+ssexec_service_resolve.o
+ssexec_service_signal.o
+ssexec_service_state.o
+ssexec_service_status.o
ssexec_service_wrapper.o
ssexec_start.o
ssexec_stop.o
-ssexec_svctl.o
-ssexec_tree.o
-ssexec_treectl.o
-ssexec_service_admin.o
+ssexec_tree_admin.o
+ssexec_tree_resolve.o
+ssexec_tree_signal.o
+ssexec_tree_status.o
ssexec_tree_wrapper.o
-ls6
-loblibs
diff --git a/src/lib66/exec/ssexec_help.c b/src/lib66/exec/ssexec_help.c
index e1d2f63f..424394d7 100644
--- a/src/lib66/exec/ssexec_help.c
+++ b/src/lib66/exec/ssexec_help.c
@@ -194,9 +194,9 @@ char const *help_unsupervise =
" -P: do not propagate signal to its dependencies\n"
;
-char const *usage_svctl = "66 signal [ -h ] [ -wu | -wU | -wd | -wD | -wr | -wR ] [ -abqHkti12pcyodDuUxOr ] service..." ;
+char const *usage_service_signal = "66 signal [ -h ] [ -wu | -wU | -wd | -wD | -wr | -wR ] [ -abqHkti12pcyodDuUxOr ] service..." ;
-char const *help_svctl =
+char const *help_service_signal =
"\nsend a signal to services\n"
"\n"
"options:\n"
@@ -229,7 +229,7 @@ char const *help_svctl =
" -r : restart service by sending it a signal(default SIGTERM)"
;
-char const *usage_tree_wrapper = "66 tree [ -h ] create|admin|remove|enable|disable|current|up|down|unsupervise [<command options>] tree" ;
+char const *usage_tree_wrapper = "66 tree [ -h ] create|admin|remove|enable|disable|current|status|resolve|up|down|unsupervise [<command options>] tree" ;
char const *help_tree_wrapper =
"\nmain sub tools to manages trees\n"
@@ -244,6 +244,8 @@ char const *help_tree_wrapper =
" enable: activate tree for the next boot\n"
" disable: deactivate tree for the next boot\n"
" current: mark tree as current\n"
+" status: display information about tree\n"
+" resolve: display resolve file of tree\n"
" up: bring up all services from tree\n"
" down: bring down all services from tree\n"
" unsupervise: bring down and unsupervise all services from tree\n"
@@ -360,7 +362,7 @@ char const *help_tree_status =
" allowed: displays a list of allowed user to use the tree\n"
" contents: displays the contents of the tree\n"
"\n"
-"If not trees are provided, it display all trees from the system\n"
+"If no tree name are provided, it display all trees from the system\n"
;
char const *usage_tree_up = "66 tree up [ -h ] [ -f ] tree" ;
diff --git a/src/lib66/exec/ssexec_resolve_service.c b/src/lib66/exec/ssexec_service_resolve.c
similarity index 99%
rename from src/lib66/exec/ssexec_resolve_service.c
rename to src/lib66/exec/ssexec_service_resolve.c
index e50af0bf..9e887175 100644
--- a/src/lib66/exec/ssexec_resolve_service.c
+++ b/src/lib66/exec/ssexec_service_resolve.c
@@ -1,5 +1,5 @@
/*
- * ssexec_resolve_service.c
+ * ssexec_service_resolve.c
*
* Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org>
*
@@ -156,7 +156,7 @@ static void info_display_service_field(resolve_service_t *res)
}
-int ssexec_resolve_service(int argc, char const *const *argv, ssexec_t *info)
+int ssexec_service_resolve(int argc, char const *const *argv, ssexec_t *info)
{
int r = 0 ;
diff --git a/src/lib66/exec/ssexec_svctl.c b/src/lib66/exec/ssexec_service_signal.c
similarity index 99%
rename from src/lib66/exec/ssexec_svctl.c
rename to src/lib66/exec/ssexec_service_signal.c
index 6ca3f14f..ce8344ce 100644
--- a/src/lib66/exec/ssexec_svctl.c
+++ b/src/lib66/exec/ssexec_service_signal.c
@@ -1,5 +1,5 @@
/*
- * ssexec_svctl.c
+ * ssexec_service_signal.c
*
* Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org>
*
@@ -800,7 +800,7 @@ static int waitit(pidservice_t *apids, unsigned int what, graph_t *graph, tain *
return e ;
}
-int ssexec_svctl(int argc, char const *const *argv, ssexec_t *info)
+int ssexec_service_signal(int argc, char const *const *argv, ssexec_t *info)
{
log_flow() ;
diff --git a/src/lib66/exec/ssexec_instate.c b/src/lib66/exec/ssexec_service_state.c
similarity index 97%
rename from src/lib66/exec/ssexec_instate.c
rename to src/lib66/exec/ssexec_service_state.c
index 105682c8..32e02d34 100644
--- a/src/lib66/exec/ssexec_instate.c
+++ b/src/lib66/exec/ssexec_service_state.c
@@ -1,5 +1,5 @@
/*
- * ssexec_instate.c
+ * ssexec_service_state.c
*
* Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org>
*
@@ -70,7 +70,7 @@ static void info_display_int(char const *field,unsigned int id)
info_display_string(field,str) ;
}
-int ssexec_instate(int argc, char const *const *argv, ssexec_t *info)
+int ssexec_service_state(int argc, char const *const *argv, ssexec_t *info)
{
int found = 0 ;
resolve_service_t res = RESOLVE_SERVICE_ZERO ;
diff --git a/src/lib66/exec/ssexec_inservice.c b/src/lib66/exec/ssexec_service_status.c
similarity index 99%
rename from src/lib66/exec/ssexec_inservice.c
rename to src/lib66/exec/ssexec_service_status.c
index 1388d05e..5b97b948 100644
--- a/src/lib66/exec/ssexec_inservice.c
+++ b/src/lib66/exec/ssexec_service_status.c
@@ -1,5 +1,5 @@
/*
- * ssexec_inservice.c
+ * ssexec_service_status.c
*
* Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org>
*
@@ -822,7 +822,7 @@ static void info_parse_options(char const *str,int *what)
stralloc_free(&sa) ;
}
-int ssexec_inservice(int argc, char const *const *argv, ssexec_t *info)
+int ssexec_service_status(int argc, char const *const *argv, ssexec_t *info)
{
unsigned int legacy = 1 ;
int r = 0 ;
diff --git a/src/lib66/exec/ssexec_service_wrapper.c b/src/lib66/exec/ssexec_service_wrapper.c
index 0c5605c5..31722aaf 100644
--- a/src/lib66/exec/ssexec_service_wrapper.c
+++ b/src/lib66/exec/ssexec_service_wrapper.c
@@ -41,7 +41,7 @@ int ssexec_service_wrapper(int argc, char const *const *argv, ssexec_t *info)
info->prog = PROG ;
info->help = help_service_status ;
info->usage = usage_service_status ;
- func = &ssexec_inservice ;
+ func = &ssexec_service_status ;
} else if (!strcmp(argv[1], "resolve")) {
@@ -49,7 +49,7 @@ int ssexec_service_wrapper(int argc, char const *const *argv, ssexec_t *info)
info->prog = PROG ;
info->help = help_service_resolve ;
info->usage = usage_service_resolve ;
- func = &ssexec_resolve_service ;
+ func = &ssexec_service_resolve ;
} else if (!strcmp(argv[1], "state")) {
@@ -57,7 +57,7 @@ int ssexec_service_wrapper(int argc, char const *const *argv, ssexec_t *info)
info->prog = PROG ;
info->help = help_service_state ;
info->usage = usage_service_state ;
- func = &ssexec_instate ;
+ func = &ssexec_service_state ;
} else if (!strcmp(argv[1], "remove")) {
diff --git a/src/lib66/exec/ssexec_tree.c b/src/lib66/exec/ssexec_tree_admin.c
similarity index 99%
rename from src/lib66/exec/ssexec_tree.c
rename to src/lib66/exec/ssexec_tree_admin.c
index 6e9c6cce..16f6ac34 100644
--- a/src/lib66/exec/ssexec_tree.c
+++ b/src/lib66/exec/ssexec_tree_admin.c
@@ -1,5 +1,5 @@
/*
- * ssexec_tree.c
+ * ssexec_tree_admin.c
*
* Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org>
*
@@ -328,7 +328,7 @@ static void tree_parse_options_depends(graph_t *g, ssexec_t *info, char const *s
log_trace("launch 66 tree sub-process for tree: ", name) ;
PROG = "tree" ;
- if (ssexec_tree(nargc, newargv, &newinfo))
+ if (ssexec_tree_admin(nargc, newargv, &newinfo))
log_dieusys(LOG_EXIT_SYS, "create tree: ", name) ;
PROG = prog ;
@@ -1251,7 +1251,7 @@ void tree_clone(char const *clone, ssexec_t *info)
log_info("Cloned successfully: ", info->treename.s, " to: ", clone) ;
}
-int ssexec_tree(int argc, char const *const *argv, ssexec_t *info)
+int ssexec_tree_admin(int argc, char const *const *argv, ssexec_t *info)
{
log_flow();
diff --git a/src/lib66/exec/ssexec_resolve_tree.c b/src/lib66/exec/ssexec_tree_resolve.c
similarity index 98%
rename from src/lib66/exec/ssexec_resolve_tree.c
rename to src/lib66/exec/ssexec_tree_resolve.c
index b632554f..c3253cf9 100644
--- a/src/lib66/exec/ssexec_resolve_tree.c
+++ b/src/lib66/exec/ssexec_tree_resolve.c
@@ -1,5 +1,5 @@
/*
- * ssexec_resolve_tree.c
+ * ssexec_tree_resolve.c
*
* Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org>
*
@@ -74,7 +74,7 @@ static void info_display_int(char const *field, uint32_t element)
log_dieusys(LOG_EXIT_SYS, "write to stdout") ;
}
-int ssexec_resolve_tree(int argc, char const *const *argv, ssexec_t *info)
+int ssexec_tree_resolve(int argc, char const *const *argv, ssexec_t *info)
{
int r = 0 ;
uint8_t master = 0 ;
diff --git a/src/lib66/exec/ssexec_treectl.c b/src/lib66/exec/ssexec_tree_signal.c
similarity index 99%
rename from src/lib66/exec/ssexec_treectl.c
rename to src/lib66/exec/ssexec_tree_signal.c
index 4c86ffb8..a730acbe 100644
--- a/src/lib66/exec/ssexec_treectl.c
+++ b/src/lib66/exec/ssexec_tree_signal.c
@@ -1,5 +1,5 @@
/*
- * ssexec_treectl.c
+ * ssexec_tree_signal.c
*
* Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org>
*
@@ -846,7 +846,7 @@ static int waitit(pidtree_t *apidt, unsigned int what, graph_t *graph, tain *dea
return e ;
}
-int ssexec_treectl(int argc, char const *const *argv, ssexec_t *info)
+int ssexec_tree_signal(int argc, char const *const *argv, ssexec_t *info)
{
log_flow() ;
diff --git a/src/lib66/exec/ssexec_intree.c b/src/lib66/exec/ssexec_tree_status.c
similarity index 99%
rename from src/lib66/exec/ssexec_intree.c
rename to src/lib66/exec/ssexec_tree_status.c
index 46d0c353..93d7a415 100644
--- a/src/lib66/exec/ssexec_intree.c
+++ b/src/lib66/exec/ssexec_tree_status.c
@@ -1,5 +1,5 @@
/*
- * ssexec_intree.c
+ * ssexec_tree_status.c
*
* Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org>
*
@@ -449,7 +449,7 @@ static void info_parse_options(char const *str,int *what)
stralloc_free(&sa) ;
}
-int ssexec_intree(int argc, char const *const *argv, ssexec_t *info)
+int ssexec_tree_status(int argc, char const *const *argv, ssexec_t *info)
{
unsigned int legacy = 1 ;
diff --git a/src/lib66/exec/ssexec_tree_wrapper.c b/src/lib66/exec/ssexec_tree_wrapper.c
index f7abc149..a1f57695 100644
--- a/src/lib66/exec/ssexec_tree_wrapper.c
+++ b/src/lib66/exec/ssexec_tree_wrapper.c
@@ -42,7 +42,7 @@ int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info)
info->prog = PROG ;
info->help = help_tree_create ;
info->usage = usage_tree_create ;
- func = &ssexec_tree ;
+ func = &ssexec_tree_admin ;
argc-- ;
argv++ ;
@@ -54,7 +54,7 @@ int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info)
info->prog = PROG ;
info->help = help_tree_admin ;
info->usage = usage_tree_admin ;
- func = &ssexec_tree ;
+ func = &ssexec_tree_admin ;
argc-- ;
argv++ ;
@@ -67,7 +67,7 @@ int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info)
info->prog = PROG ;
info->help = help_tree_remove ;
info->usage = usage_tree_remove ;
- func = &ssexec_tree ;
+ func = &ssexec_tree_admin ;
argc-- ;
argv++ ;
@@ -80,7 +80,7 @@ int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info)
info->prog = PROG ;
info->help = help_tree_enable ;
info->usage = usage_tree_enable ;
- func = &ssexec_tree ;
+ func = &ssexec_tree_admin ;
argc-- ;
argv++ ;
@@ -94,7 +94,7 @@ int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info)
info->help = help_tree_disable ;
info->usage = usage_tree_disable ;
- func = &ssexec_tree ;
+ func = &ssexec_tree_admin ;
argc-- ;
argv++ ;
@@ -108,7 +108,7 @@ int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info)
info->help = help_tree_current ;
info->usage = usage_tree_current ;
- func = &ssexec_tree ;
+ func = &ssexec_tree_admin ;
argc-- ;
argv++ ;
@@ -121,7 +121,7 @@ int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info)
info->help = help_tree_resolve ;
info->usage = usage_tree_resolve ;
- func = &ssexec_resolve_tree ;
+ func = &ssexec_tree_resolve ;
argc-- ;
argv++ ;
@@ -134,7 +134,7 @@ int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info)
info->help = help_tree_status ;
info->usage = usage_tree_status ;
- func = &ssexec_intree ;
+ func = &ssexec_tree_status ;
argc-- ;
argv++ ;
@@ -144,7 +144,7 @@ int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info)
info->prog = PROG ;
info->help = help_tree_up ;
info->usage = usage_tree_up ;
- func = &ssexec_treectl ;
+ func = &ssexec_tree_signal ;
ctl++ ;
} else if (!strcmp(argv[1], "down")) {
@@ -152,7 +152,7 @@ int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info)
info->prog = PROG ;
info->help = help_tree_down ;
info->usage = usage_tree_down ;
- func = &ssexec_treectl ;
+ func = &ssexec_tree_signal ;
ctl++ ;
} else if (!strcmp(argv[1], "unsupervise")) {
@@ -160,7 +160,7 @@ int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info)
info->prog = PROG ;
info->help = help_tree_unsupervise ;
info->usage = usage_tree_unsupervise ;
- func = &ssexec_treectl ;
+ func = &ssexec_tree_signal ;
ctl++ ;
} else {
diff --git a/src/lib66/sanitize/sanitize_system.c b/src/lib66/sanitize/sanitize_system.c
index 3b1d200c..c019b459 100644
--- a/src/lib66/sanitize/sanitize_system.c
+++ b/src/lib66/sanitize/sanitize_system.c
@@ -168,7 +168,7 @@ int sanitize_system(ssexec_t *info)
char const *prog = PROG ;
PROG = "tree" ;
- if (ssexec_tree(nargc, newargv, info))
+ if (ssexec_tree_admin(nargc, newargv, info))
log_dieu(LOG_EXIT_SYS, "create tree: ", SS_DEFAULT_TREENAME) ;
PROG = prog ;
diff --git a/src/lib66/svc/svc_send.c b/src/lib66/svc/svc_send.c
index 8f40eee0..d2e90b4d 100644
--- a/src/lib66/svc/svc_send.c
+++ b/src/lib66/svc/svc_send.c
@@ -35,6 +35,6 @@ int svc_send(char const *const *list, unsigned int nservice, char **sig, unsigne
newargv[m++] = 0 ;
- return ssexec_svctl(nargc, newargv, info) ;
+ return ssexec_service_signal(nargc, newargv, info) ;
}
diff --git a/src/lib66/tree/tree_sethome.c b/src/lib66/tree/tree_sethome.c
index ceb84526..6f071ce9 100644
--- a/src/lib66/tree/tree_sethome.c
+++ b/src/lib66/tree/tree_sethome.c
@@ -76,7 +76,7 @@ int tree_sethome(ssexec_t *info)
char const *prog = PROG ;
PROG = "tree" ;
- if (ssexec_tree(nargc, newargv, info))
+ if (ssexec_tree_admin(nargc, newargv, info))
log_warnu_return(LOG_EXIT_ZERO,"create tree: ",info->treename.s) ;
PROG = prog ;
}
--
GitLab