diff options
| -rwxr-xr-x | init.d.BSD/clock | 2 | ||||
| -rwxr-xr-x | init.d.Linux/clock | 2 | ||||
| -rwxr-xr-x | sh/rc-help.sh | 12 | ||||
| -rwxr-xr-x | sh/runscript.sh | 4 | ||||
| -rw-r--r-- | src/librc.c | 10 | ||||
| -rw-r--r-- | src/librc.h | 2 | ||||
| -rw-r--r-- | src/rc.h | 8 |
7 files changed, 20 insertions, 20 deletions
diff --git a/init.d.BSD/clock b/init.d.BSD/clock index f22de2e6..26f893ae 100755 --- a/init.d.BSD/clock +++ b/init.d.BSD/clock @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -opts="save" +extra_commands="save" description="Sets the local clock to UTC or Local Time." description_save="Saves the current time in the BIOS." diff --git a/init.d.Linux/clock b/init.d.Linux/clock index b835cc39..55d706dc 100755 --- a/init.d.Linux/clock +++ b/init.d.Linux/clock @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -opts="save show" +extra_commands="save show" description="Sets the local clock to UTC or Local Time." description_save="Saves the current time in the BIOS." diff --git a/sh/rc-help.sh b/sh/rc-help.sh index 69a87977..d4995df7 100755 --- a/sh/rc-help.sh +++ b/sh/rc-help.sh @@ -54,12 +54,12 @@ else NL= fi -default_opts="describe help start status stop restart zap" -extra_opts="$(. "${myscript}" 2>/dev/null ; echo "${opts}")" +default_commands="describe help start status stop restart zap" +extra_commands="$(. "${myscript}" 2>/dev/null ; echo "${extra_commands:-${opts}}")" printf "Usage: ${CYAN}${SERVICE}${OFF} [ ${GREEN}flags${OFF} ] < ${GREEN}options${OFF} > -${CYAN}Normal Options:${OFF}" +${CYAN}Normal Commands:${OFF}" if [ "${BE_VERBOSE}" = "yes" ] ; then printf " @@ -115,16 +115,16 @@ printf " else -printf " ${GREEN}${default_opts}${OFF} +printf " ${GREEN}${default_commands}${OFF} Default init.d options. " fi -if [ -n "${extra_opts}" ] ; then +if [ -n "${extra_commands}" ] ; then printf " ${CYAN}Additional Options:${OFF}${NL} - ${GREEN}${extra_opts}${OFF} + ${GREEN}${extra_commands}${OFF} Extra options supported by this init.d script. " fi diff --git a/sh/runscript.sh b/sh/runscript.sh index e5eb5c22..8aab605c 100755 --- a/sh/runscript.sh +++ b/sh/runscript.sh @@ -49,7 +49,7 @@ describe() { fi local svc= desc= - for svc in ${opts}; do + for svc in ${extra_commands:-${opts}}; do eval desc=\$description_${svc} if [ -n "${desc}" ]; then einfo "${HILITE}${svc}${NORMAL}: ${desc}" @@ -128,7 +128,7 @@ fi while [ -n "$1" ]; do # See if we have the required function and run it - for rc_x in describe start stop ${opts}; do + for rc_x in describe start stop ${extra_commands:-${opts}}; do if [ "${rc_x}" = "$1" ]; then if type "$1" >/dev/null 2>&1; then unset rc_x diff --git a/src/librc.c b/src/librc.c index d5ab76fa..da443b77 100644 --- a/src/librc.c +++ b/src/librc.c @@ -300,12 +300,12 @@ bool rc_service_exists (const char *service) librc_hidden_def(rc_service_exists) #define OPTSTR ". '%s'; echo \"${opts}\"" -char **rc_service_options (const char *service) +char **rc_service_extra_commands (const char *service) { char *svc; char *cmd = NULL; char *buffer = NULL; - char **opts = NULL; + char **commands = NULL; char *token; char *p = buffer; FILE *fp; @@ -324,15 +324,15 @@ char **rc_service_options (const char *service) if (buffer[strlen (buffer) - 1] == '\n') buffer[strlen (buffer) - 1] = '\0'; while ((token = strsep (&p, " "))) - rc_strlist_addsort (&opts, token); + rc_strlist_addsort (&commands, token); } pclose (fp); free (buffer); } free (cmd); - return (opts); + return (commands); } -librc_hidden_def(rc_service_options) +librc_hidden_def(rc_service_extra_commands) #define DESCSTR ". '%s'; echo \"${description%s%s}\"" char *rc_service_description (const char *service, const char *option) diff --git a/src/librc.h b/src/librc.h index a48f9f99..fb37e8c0 100644 --- a/src/librc.h +++ b/src/librc.h @@ -95,9 +95,9 @@ librc_hidden_proto(rc_service_daemon_set) librc_hidden_proto(rc_service_delete) librc_hidden_proto(rc_service_description) librc_hidden_proto(rc_service_exists) +librc_hidden_proto(rc_service_extra_commands) librc_hidden_proto(rc_service_in_runlevel) librc_hidden_proto(rc_service_mark) -librc_hidden_proto(rc_service_options) librc_hidden_proto(rc_service_plugable) librc_hidden_proto(rc_service_resolve) librc_hidden_proto(rc_service_schedule_clear) @@ -143,10 +143,10 @@ bool rc_service_in_runlevel (const char *service, const char *runlevel); * @return true if service state change was successful, otherwise false */ bool rc_service_mark (const char *service, rc_service_state_t state); -/*! Lists the extra options a service has - * @param service to load the options from - * @return NULL terminated string list of options */ -char **rc_service_options (const char *service); +/*! Lists the extra commands a service has + * @param service to load the commands from + * @return NULL terminated string list of commands */ +char **rc_service_extra_commands (const char *service); /*! Check if the service is allowed to be hot/cold plugged * @param service to check |