From 70cb9e4f095725d1373ef15a8a0a0674b082a302 Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Fri, 27 Jan 2023 11:04:14 +1100
Subject: [PATCH] avoid conflict with main options
---
src/lib66/exec/ssexec_help.c | 2 +-
src/lib66/exec/ssexec_svctl.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib66/exec/ssexec_help.c b/src/lib66/exec/ssexec_help.c
index 928804f9..4e264c4b 100644
--- a/src/lib66/exec/ssexec_help.c
+++ b/src/lib66/exec/ssexec_help.c
@@ -96,7 +96,7 @@ char const *help_stop =
" -u: unsupervise service(s)\n"
;
-char const *usage_svctl = "66 svctl [ -h ] [ -z ] [ -v verbosity ] [ -l live ] [ -t tree ] [ -T timeout ] [ -wu | -wU | -wd | -wD | -wr | -wR ] [ -abqhkti12pcyoduxOr ] service(s)" ;
+char const *usage_svctl = "66 svctl [ -h ] [ -z ] [ -v verbosity ] [ -l live ] [ -t tree ] [ -T timeout ] [ -wu | -wU | -wd | -wD | -wr | -wR ] [ -abqHkti12pcyoduxOr ] service(s)" ;
char const *help_svctl =
"\n"
diff --git a/src/lib66/exec/ssexec_svctl.c b/src/lib66/exec/ssexec_svctl.c
index 8b751dca..4ef157b6 100644
--- a/src/lib66/exec/ssexec_svctl.c
+++ b/src/lib66/exec/ssexec_svctl.c
@@ -174,7 +174,7 @@ static int pidservice_get_id(pidservice_t *apids, unsigned int id)
return -1 ;
}
-void notify(pidservice_t *apids, unsigned int pos, char const *sig, unsigned int what)
+static void notify(pidservice_t *apids, unsigned int pos, char const *sig, unsigned int what)
{
log_flow() ;
@@ -842,7 +842,7 @@ int ssexec_svctl(int argc, char const *const *argv, ssexec_t *info)
case 'a' :
case 'b' :
case 'q' :
- case 'h' :
+ case 'H' :
case 'k' :
case 't' :
case 'i' :
@@ -861,7 +861,7 @@ int ssexec_svctl(int argc, char const *const *argv, ssexec_t *info)
if (datalen >= DATASIZE)
log_die(LOG_EXIT_USER, "too many arguments") ;
- data[datalen++] = opt ;
+ data[datalen++] = opt == 'H' ? 'h' : opt ;
break ;
case 'w' :
--
GitLab