aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/librc.c76
-rw-r--r--src/librc.h2
-rw-r--r--src/rc.h2
-rw-r--r--src/runscript.c112
4 files changed, 139 insertions, 53 deletions
diff --git a/src/librc.c b/src/librc.c
index 6392426b..4ee82f01 100644
--- a/src/librc.c
+++ b/src/librc.c
@@ -172,6 +172,82 @@ bool rc_service_exists (const char *service)
}
librc_hidden_def(rc_service_exists)
+char **rc_service_options (const char *service)
+{
+ char *svc;
+ char cmd[PATH_MAX];
+ char buffer[RC_LINEBUFFER];
+ char **opts = NULL;
+ char *token;
+ char *p = buffer;
+ FILE *fp;
+
+ if (! rc_service_exists (service))
+ return (NULL);
+
+ svc = rc_resolve_service (service);
+
+ snprintf (cmd, sizeof (cmd), ". '%s'; echo \"${opts}\"", svc);
+ if (! (fp = popen (cmd, "r"))) {
+ eerror ("popen `%s': %s", svc, strerror (errno));
+ free (svc);
+ return (NULL);
+ }
+
+ if (fgets (buffer, RC_LINEBUFFER, fp)) {
+ if (buffer[strlen (buffer) - 1] == '\n')
+ buffer[strlen (buffer) - 1] = '\0';
+ while ((token = strsep (&p, " ")))
+ opts = rc_strlist_addsort (opts, token);
+ }
+ pclose (fp);
+ return (opts);
+}
+librc_hidden_def(rc_service_options)
+
+char *rc_service_description (const char *service, const char *function)
+{
+ char *svc;
+ char cmd[PATH_MAX];
+ char buffer[RC_LINEBUFFER];
+ char *desc = NULL;
+ FILE *fp;
+ int i;
+
+ if (! rc_service_exists (service))
+ return (NULL);
+
+ svc = rc_resolve_service (service);
+
+ if (! function)
+ function = "";
+
+ snprintf (cmd, sizeof (cmd), ". '%s'; echo \"${description%s%s}\"",
+ svc, function ? "_" : "", function);
+ if (! (fp = popen (cmd, "r"))) {
+ eerror ("popen `%s': %s", svc, strerror (errno));
+ free (svc);
+ return (NULL);
+ }
+ free (svc);
+
+ while (fgets (buffer, RC_LINEBUFFER, fp)) {
+ if (! desc) {
+ desc = rc_xmalloc (strlen (buffer) + 1);
+ *desc = '\0';
+ } else {
+ desc = rc_xrealloc (desc, strlen (desc) + strlen (buffer) + 1);
+ }
+ i = strlen (desc);
+ memcpy (desc + i, buffer, strlen (buffer));
+ memset (desc + i + strlen (buffer), 0, 1);
+ }
+
+ pclose (fp);
+ return (desc);
+}
+librc_hidden_def(rc_service_description)
+
bool rc_service_in_runlevel (const char *service, const char *runlevel)
{
char *file;
diff --git a/src/librc.h b/src/librc.h
index cbf26d95..ec126aba 100644
--- a/src/librc.h
+++ b/src/librc.h
@@ -84,8 +84,10 @@ librc_hidden_proto(rc_schedule_start_service)
librc_hidden_proto(rc_service_add)
librc_hidden_proto(rc_service_daemons_crashed)
librc_hidden_proto(rc_service_delete)
+librc_hidden_proto(rc_service_description)
librc_hidden_proto(rc_service_exists)
librc_hidden_proto(rc_service_in_runlevel)
+librc_hidden_proto(rc_service_options)
librc_hidden_proto(rc_services_in_runlevel)
librc_hidden_proto(rc_services_in_state)
librc_hidden_proto(rc_services_scheduled)
diff --git a/src/rc.h b/src/rc.h
index 125bb1f8..8300f725 100644
--- a/src/rc.h
+++ b/src/rc.h
@@ -44,6 +44,8 @@ typedef enum
char *rc_resolve_service (const char *service);
bool rc_service_exists (const char *service);
+char **rc_service_options (const char *service);
+char *rc_service_description (const char *service, const char *function);
bool rc_service_in_runlevel (const char *service, const char *runlevel);
bool rc_service_state (const char *service, rc_service_state_t state);
bool rc_mark_service (const char *service, rc_service_state_t state);
diff --git a/src/runscript.c b/src/runscript.c
index b439d2b3..2e41d59e 100644
--- a/src/runscript.c
+++ b/src/runscript.c
@@ -1182,8 +1182,6 @@ int main (int argc, char **argv)
if (strcmp (optarg, "status") != 0 &&
strcmp (optarg, "help") != 0) {
/* Only root should be able to run us */
- if (geteuid () != 0)
- eerrorx ("%s: root access required", applet);
}
/* Export the command we're running.
@@ -1194,43 +1192,7 @@ int main (int argc, char **argv)
setenv ("RC_CMD", optarg, 1);
doneone = true;
- if (strcmp (optarg, "conditionalrestart") == 0 ||
- strcmp (optarg, "condrestart") == 0)
- {
- if (rc_service_state (service, rc_service_started))
- svc_restart (deps);
- }
- else if (strcmp (optarg, "restart") == 0)
- svc_restart (deps);
- else if (strcmp (optarg, "start") == 0)
- svc_start (deps);
- else if (strcmp (optarg, "status") == 0) {
- rc_service_state_t r = svc_status (service);
- retval = (int) r;
- } else if (strcmp (optarg, "stop") == 0) {
- if (in_background)
- get_started_services ();
-
- svc_stop (deps);
-
- if (! in_background &&
- ! rc_runlevel_stopping () &&
- rc_service_state (service, rc_service_stopped))
- uncoldplug ();
-
- if (in_background &&
- rc_service_state (service, rc_service_inactive))
- {
- int j;
- STRLIST_FOREACH (restart_services, svc, j)
- if (rc_service_state (svc, rc_service_stopped))
- rc_schedule_start_service (service, svc);
- }
- } else if (strcmp (optarg, "zap") == 0) {
- einfo ("Manually resetting %s to stopped state", applet);
- rc_mark_service (applet, rc_service_stopped);
- uncoldplug ();
- } else if (strcmp (optarg, "help") == 0) {
+ if (strcmp (optarg, "help") == 0) {
execl (RCSCRIPT_HELP, RCSCRIPT_HELP, service, "help", (char *) NULL);
eerrorx ("%s: failed to exec `" RCSCRIPT_HELP "': %s",
applet, strerror (errno));
@@ -1239,8 +1201,8 @@ int main (int argc, char **argv)
strcmp (optarg, "needsme") == 0 ||
strcmp (optarg, "usesme") == 0 ||
strcmp (optarg, "iafter") == 0 ||
- strcmp (optarg, "ibefore") == 0
- strcmp (optorg, "iprovide") == 0) {
+ strcmp (optarg, "ibefore") == 0 ||
+ strcmp (optarg, "iprovide") == 0) {
if (! deptree && ((deptree = rc_load_deptree ()) == NULL))
eerrorx ("failed to load deptree");
@@ -1253,21 +1215,65 @@ int main (int argc, char **argv)
STRLIST_FOREACH (services, svc, i)
printf ("%s%s", i == 1 ? "" : " ", svc);
printf ("\n");
- }else
- svc_exec (optarg, NULL);
+ } else if (strcmp (optarg, "status") == 0) {
+ rc_service_state_t r = svc_status (service);
+ retval = (int) r;
+ } else if (strcmp (optarg, "help") == 0) {
+ execl (RCSCRIPT_HELP, RCSCRIPT_HELP, service, "help", (char *) NULL);
+ eerrorx ("%s: failed to exec `" RCSCRIPT_HELP "': %s",
+ applet, strerror (errno));
+ } else {
+ if (geteuid () != 0)
+ eerrorx ("%s: root access required", applet);
- /* Flush our buffered output if any */
- eflush ();
+ if (strcmp (optarg, "conditionalrestart") == 0 ||
+ strcmp (optarg, "condrestart") == 0)
+ {
+ if (rc_service_state (service, rc_service_started))
+ svc_restart (deps);
+ } else if (strcmp (optarg, "restart") == 0) {
+ svc_restart (deps);
+ } else if (strcmp (optarg, "start") == 0) {
+ svc_start (deps);
+ } else if (strcmp (optarg, "stop") == 0) {
+ if (in_background)
+ get_started_services ();
- /* We should ensure this list is empty after an action is done */
- rc_strlist_free (restart_services);
- restart_services = NULL;
- }
+ svc_stop (deps);
- if (! doneone) {
- execl (RCSCRIPT_HELP, RCSCRIPT_HELP, service, (char *) NULL);
- eerrorx ("%s: failed to exec `" RCSCRIPT_HELP "': %s",
- applet, strerror (errno));
+ if (! in_background &&
+ ! rc_runlevel_stopping () &&
+ rc_service_state (service, rc_service_stopped))
+ uncoldplug ();
+
+ if (in_background &&
+ rc_service_state (service, rc_service_inactive))
+ {
+ int j;
+ STRLIST_FOREACH (restart_services, svc, j)
+ if (rc_service_state (svc, rc_service_stopped))
+ rc_schedule_start_service (service, svc);
+ }
+ } else if (strcmp (optarg, "zap") == 0) {
+ einfo ("Manually resetting %s to stopped state", applet);
+ rc_mark_service (applet, rc_service_stopped);
+ uncoldplug ();
+ }else
+ svc_exec (optarg, NULL);
+
+ /* Flush our buffered output if any */
+ eflush ();
+
+ /* We should ensure this list is empty after an action is done */
+ rc_strlist_free (restart_services);
+ restart_services = NULL;
+ }
+
+ if (! doneone) {
+ execl (RCSCRIPT_HELP, RCSCRIPT_HELP, service, (char *) NULL);
+ eerrorx ("%s: failed to exec `" RCSCRIPT_HELP "': %s",
+ applet, strerror (errno));
+ }
}
return (retval);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 22:48:14 +0000