opts -> extra_commands. This is much more descriptive.
This commit is contained in:
10
src/librc.c
10
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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
8
src/rc.h
8
src/rc.h
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user