[patch] Make rc_service_extra_commands return an empty list rather than a list containing a single empty string when there are no extra commands.

0003-Make-rc_service_extra_commands-return-an-empty-list-.patch (text/plain), 1.11 KB, created by James Le Cuirot on 2011-04-20 11:07:02 UTC

From 58dfe9930a9d14fdb9c9ff00d0ec5dd1f4ca1531 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <[e-mail]>
Date: Wed, 20 Apr 2011 11:55:06 +0100
Subject: [PATCH 3/3] Make rc_service_extra_commands return an empty list rather than a list containing a single empty string when there are no extra commands.

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

diff --git a/src/librc/librc.c b/src/librc/librc.c
index afcd391..8de93a1 100644
--- a/src/librc/librc.c
+++ b/src/librc/librc.c
@@ -550,14 +550,15 @@ rc_service_extra_commands(const char *service)
 	if ((fp = popen(cmd, "r"))) {
 		rc_getline(&buffer, &len, fp);
 		p = buffer;
-		while ((token = strsep(&p, " "))) {
-			if (!commands)
-				commands = rc_stringlist_new();
-			rc_stringlist_add(commands, token);
-		}
+		commands = rc_stringlist_new();
+
+		while ((token = strsep(&p, " ")))
+			if (token[0] != '\0') rc_stringlist_add(commands, token);
+
 		pclose(fp);
 		free(buffer);
 	}
+
 	free(cmd);
 	return commands;
 }
-- 
1.7.4