[patch] Use the newer extra_commands and extra_started_commands variables in the list returned by rc_service_extra_commands.

0001-Use-the-newer-extra_commands-and-extra_started_comma.patch (text/plain), 1.22 KB, created by James Le Cuirot on 2011-04-19 20:25:05 UTC

From 7f845e69421f0215ca371ea6aa3c1004ed48fc1b Mon Sep 17 00:00:00 2001
From: James Le Cuirot <[e-mail]>
Date: Tue, 19 Apr 2011 20:52:07 +0100
Subject: [PATCH 1/2] Use the newer extra_commands and extra_started_commands variables in the list returned by rc_service_extra_commands.

X-Gentoo-Bug: 360013
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=360013
---
 src/librc/librc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/librc/librc.c b/src/librc/librc.c
index e134547..afcd391 100644
--- a/src/librc/librc.c
+++ b/src/librc/librc.c
@@ -525,7 +525,7 @@ rc_service_exists(const char *service)
 }
 librc_hidden_def(rc_service_exists)
 
-#define OPTSTR ". '%s'; echo $opts"
+#define EXTRASTR ". '%s'; echo $extra_commands $extra_started_commands"
 RC_STRINGLIST *
 rc_service_extra_commands(const char *service)
 {
@@ -542,9 +542,9 @@ rc_service_extra_commands(const char *service)
 	if (!(svc = rc_service_resolve(service)))
 		return NULL;
 
-	l = strlen(OPTSTR) + strlen(svc) + 1;
+	l = strlen(EXTRASTR) + strlen(svc) + 1;
 	cmd = xmalloc(sizeof(char) * l);
-	snprintf(cmd, l, OPTSTR, svc);
+	snprintf(cmd, l, EXTRASTR, svc);
 	free(svc);
 
 	if ((fp = popen(cmd, "r"))) {
-- 
1.7.4