diff --git a/src/66/66.c b/src/66/66.c
index bd4d9566ff0c8a48245637700f94660820cb6e3d..a2c1616d66b96346973dfa2e5dca356ac4be6a4c 100644
--- a/src/66/66.c
+++ b/src/66/66.c
@@ -88,7 +88,6 @@ int main(int argc, char const *const *argv)
int r, n = 0, i = 0 ;
uint8_t sanitize = 0 ;
- char const *main = "hv:l:t:T:z" ;
char str[UINT_FMT] ;
char const *nargv[argc + 3] ;
@@ -111,7 +110,7 @@ int main(int argc, char const *const *argv)
int f = 0 ;
for (;;)
{
- int opt = subgetopt_r(argc, argv, main, &l) ;
+ int opt = subgetopt_r(argc, argv, OPTS_MAIN, &l) ;
if (opt == -1) break ;
switch (opt)
diff --git a/src/include/66/ssexec.h b/src/include/66/ssexec.h
index eac0d39e7ed7838b8a1aa43b5aa49577f3402593..762a2aa17777c6f4fb4925c956becb676fec754c 100644
--- a/src/include/66/ssexec.h
+++ b/src/include/66/ssexec.h
@@ -224,6 +224,8 @@ extern char const *help_reboot ;
extern char const *usage_halt ;
extern char const *help_halt ;
+#define OPTS_MAIN "hv:l:t:T:z"
+#define OPTS_MAIN_LEN (sizeof OPTS_MAIN - 1)
#define OPTS_SUBSTART "hP"
#define OPTS_SUBSTART_LEN (sizeof OPTS_SUBSTART - 1)
#define OPTS_PARSE "hfFcmCI"
@@ -232,38 +234,38 @@ extern char const *help_halt ;
#define OPTS_INIT_LEN (sizeof OPTS_INIT - 1)
#define OPTS_ENABLE "hfSI"
#define OPTS_ENABLE_LEN (sizeof OPTS_ENABLE - 1)
-#define OPTS_DISABLE "hS"
+#define OPTS_DISABLE "hSFR"
#define OPTS_DISABLE_LEN (sizeof OPTS_DISABLE - 1)
#define OPTS_START "hP"
#define OPTS_START_LEN (sizeof OPTS_START - 1)
#define OPTS_STOP "huP"
#define OPTS_STOP_LEN (sizeof OPTS_STOP - 1)
-#define OPTS_SVCTL "habqHkti12pcyrodDuUxOw:P"
-#define OPTS_SVCTL_LEN (sizeof OPTS_SVCTL - 1)
+#define OPTS_STATUS "hno:grd:p:"
+#define OPTS_STATUS_LEN (sizeof OPTS_STATUS - 1)
+#define OPTS_SIGNAL "habqHkti12pcyrodDuUxOQw:P"
+#define OPTS_SIGNAL_LEN (sizeof OPTS_SIGNAL - 1)
#define OPTS_ENV "hc:s:VLr:e:i:"
#define OPTS_ENV_LEN (sizeof OPTS_ENV - 1)
-#define OPTS_TREECTL "f"
-#define OPTS_TREECTL_LEN (sizeof OPTS_TREECTL - 1)
-#define OPTS_TREE "hco:EDRnadC:S:"
-#define OPTS_TREE_LEN (sizeof OPTS_TREE - 1)
-#define OPTS_INTREE "no:grd:"
-#define OPTS_INTREE_LEN (sizeof OPTS_INTREE - 1)
-#define OPTS_INSERVICE "no:grd:p:"
-#define OPTS_INSERVICE_LEN (sizeof OPTS_INSERVICE - 1)
+
+#define OPTS_TREE_WRAPPER "h"
+#define OPTS_TREE_WRAPPER_LEN (sizeof OPTS_TREE_WRAPPER - 1)
+#define OPTS_TREE_STATUS "no:grd:"
+#define OPTS_TREE_STATUS_LEN (sizeof OPTS_TREE_STATUS - 1)
+#define OPTS_TREE_SIGNAL "f"
+#define OPTS_TREE_SIGNAL_LEN (sizeof OPTS_TREE_SIGNAL - 1)
+#define OPTS_TREE_ADMIN "co:EDRnadC:S:"
+#define OPTS_TREE_ADMIN_LEN (sizeof OPTS_TREE_ADMIN - 1)
+
#define OPTS_BOOT "hms:e:d:b:l:"
#define OPTS_BOOT_LEN (sizeof OPTS_BOOT - 1)
-#define OPTS_SCANCTL "d:s:e:bB"
-#define OPTS_SCANCTL_LEN (sizeof OPTS_SCANCTL - 1)
+
#define OPTS_SCANDIR_WRAPPER "ho:"
#define OPTS_SCANCTL_WRAPPER_LEN (sizeof OPTS_SCANDIR_WRAPPER - 1)
+#define OPTS_SCANDIR_SIGNAL "d:s:e:bB"
+#define OPTS_SCANDIR_SIGNAL_LEN (sizeof OPTS_SCANDIR_SIGNAL - 1)
#define OPTS_SCANDIR_CREATE "bBs:cL:"
#define OPTS_SCANDIR_CREATE_LEN (sizeof OPTS_SCANDIR_CREATE - 1)
-#define OPTS_SERVICE_WRAPPER ""
-#define OPTS_SERVICE_WRAPPER_LEN (sizeof OPTS_SERVICE_WRAPPER - 1)
-#define OPTS_SERVICE_ADMIN ""
-#define OPTS_SERVICE_ADMIN_LEN (sizeof OPTS_SERVICE_ADMIN - 1)
-
#define OPTS_SHUTDOWN_WRAPPER "hFfat:m:W"
#define OPTS_SHUTDOWN_WRAPPER_LEN (sizeof OPTS_SHUTDOWN_WRAPPER - 1)
diff --git a/src/lib66/exec/ssexec_scandir_signal.c b/src/lib66/exec/ssexec_scandir_signal.c
index aa693a05416e356405e3b094cc47c6619cd47cd8..dfc1c56de896fb5ce0bff9623d4be28a6e26c26b 100644
--- a/src/lib66/exec/ssexec_scandir_signal.c
+++ b/src/lib66/exec/ssexec_scandir_signal.c
@@ -207,7 +207,7 @@ int ssexec_scandir_signal(int argc, char const *const *argv, ssexec_t *info)
for (;;) {
- int opt = subgetopt_r(argc,argv, OPTS_SCANCTL, &l) ;
+ int opt = subgetopt_r(argc,argv, OPTS_SCANDIR_SIGNAL, &l) ;
if (opt == -1) break ;
switch (opt) {
diff --git a/src/lib66/exec/ssexec_scandir_wrapper.c b/src/lib66/exec/ssexec_scandir_wrapper.c
index 2cf5a1054ff504030347b2ff3908b2eca4913c79..8ad4f8677bf7362029599227aad1181f27e5ab03 100644
--- a/src/lib66/exec/ssexec_scandir_wrapper.c
+++ b/src/lib66/exec/ssexec_scandir_wrapper.c
@@ -46,7 +46,7 @@ int ssexec_scandir_wrapper(int argc, char const *const *argv, ssexec_t *info)
for (;;) {
- int opt = subgetopt_r(argc, argv, "ho:", &l) ;
+ int opt = subgetopt_r(argc, argv, OPTS_SCANDIR_WRAPPER, &l) ;
if (opt == -1) break ;
switch (opt) {
diff --git a/src/lib66/exec/ssexec_signal.c b/src/lib66/exec/ssexec_signal.c
index bc7680e49cf93bb53d5dfba1e5458d3c43ce5269..d0fb5d82956b795bf9f1a270c6f049db69397129 100644
--- a/src/lib66/exec/ssexec_signal.c
+++ b/src/lib66/exec/ssexec_signal.c
@@ -836,11 +836,11 @@ int ssexec_signal(int argc, char const *const *argv, ssexec_t *info)
for (;;)
{
- int opt = subgetopt_r(argc,argv, OPTS_SVCTL, &l) ;
+ int opt = subgetopt_r(argc,argv, OPTS_SIGNAL, &l) ;
if (opt == -1) break ;
switch (opt) {
-
+ case 'h' : info_help(info->help, info->usage) ; return 0 ;
case 'a' :
case 'b' :
case 'q' :
diff --git a/src/lib66/exec/ssexec_status.c b/src/lib66/exec/ssexec_status.c
index 4354986c7f20e28ed7191c2ac538e512ec63ddb2..ce45ad288b0d9472247b2f79d9d847401d3c57b3 100644
--- a/src/lib66/exec/ssexec_status.c
+++ b/src/lib66/exec/ssexec_status.c
@@ -865,11 +865,11 @@ int ssexec_status(int argc, char const *const *argv, ssexec_t *info)
for (;;)
{
- int opt = subgetopt_r(argc,argv, OPTS_INSERVICE, &l) ;
+ int opt = subgetopt_r(argc,argv, OPTS_STATUS, &l) ;
if (opt == -1) break ;
switch (opt) {
-
+ case 'h' : info_help(info->help, info->usage) ; return 0 ;
case 'n' : NOFIELD = 0 ; break ;
case 'o' : legacy = 0 ; info_parse_options(l.arg,what) ; break ;
case 'g' : GRAPH = 1 ; break ;
diff --git a/src/lib66/exec/ssexec_tree_admin.c b/src/lib66/exec/ssexec_tree_admin.c
index 18eb22cf85ce7e2f98ec5451de887b2f2176ca7d..6ede0c5fa5eae1be3e1abd2aa7ce2c20bd69278f 100644
--- a/src/lib66/exec/ssexec_tree_admin.c
+++ b/src/lib66/exec/ssexec_tree_admin.c
@@ -1128,7 +1128,7 @@ int ssexec_tree_admin(int argc, char const *const *argv, ssexec_t *info)
for (;;)
{
- int opt = subgetopt_r(argc, argv, OPTS_TREE, &l) ;
+ int opt = subgetopt_r(argc, argv, OPTS_TREE_ADMIN, &l) ;
if (opt == -1) break ;
switch (opt)
diff --git a/src/lib66/exec/ssexec_tree_signal.c b/src/lib66/exec/ssexec_tree_signal.c
index a88ec0655d26d6cc94ba1784ce496bbd201638ba..b507fee3079a4f9c009b882c4b449ca5d0cc3156 100644
--- a/src/lib66/exec/ssexec_tree_signal.c
+++ b/src/lib66/exec/ssexec_tree_signal.c
@@ -867,7 +867,7 @@ int ssexec_tree_signal(int argc, char const *const *argv, ssexec_t *info)
for (;;)
{
- int opt = subgetopt_r(argc, argv, OPTS_TREECTL, &l) ;
+ int opt = subgetopt_r(argc, argv, OPTS_TREE_SIGNAL, &l) ;
if (opt == -1) break ;
switch (opt) {
diff --git a/src/lib66/exec/ssexec_tree_status.c b/src/lib66/exec/ssexec_tree_status.c
index 702b37bae36eeafbe86685fb69f6779f0f2b4452..4b2acd5d4cc5d203e571537d4c241adf0ec3e320 100644
--- a/src/lib66/exec/ssexec_tree_status.c
+++ b/src/lib66/exec/ssexec_tree_status.c
@@ -481,7 +481,7 @@ int ssexec_tree_status(int argc, char const *const *argv, ssexec_t *info)
for (;;)
{
- int opt = subgetopt_r(argc, argv, OPTS_INTREE, &l) ;
+ int opt = subgetopt_r(argc, argv, OPTS_TREE_STATUS, &l) ;
if (opt == -1) break ;
switch (opt)
diff --git a/src/lib66/exec/ssexec_tree_wrapper.c b/src/lib66/exec/ssexec_tree_wrapper.c
index 4312ea1e930a698b73378a898dac585d53dda4e0..eada7b903f1ef6f88a4ed1fd01d461fdeef4c9a0 100644
--- a/src/lib66/exec/ssexec_tree_wrapper.c
+++ b/src/lib66/exec/ssexec_tree_wrapper.c
@@ -179,7 +179,7 @@ int ssexec_tree_wrapper(int argc, char const *const *argv, ssexec_t *info)
int f = 0 ;
for (;;) {
- int opt = subgetopt_r(argc, argv, "h", &l) ;
+ int opt = subgetopt_r(argc, argv, OPTS_TREE_WRAPPER, &l) ;
if (opt == -1) break ;
switch (opt) {