From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QFEwH-0002Mi-0m for garchives@archives.gentoo.org; Thu, 28 Apr 2011 00:18:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 297211C013; Thu, 28 Apr 2011 00:18:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CD0B21C009 for ; Thu, 28 Apr 2011 00:18:27 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3271F1B405D for ; Thu, 28 Apr 2011 00:18:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7D76280507 for ; Thu, 28 Apr 2011 00:18:26 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <8fcaba9a22ac0deda7dc6a8d5f270d1df08f9966.williamH@gentoo> Subject: [gentoo-commits] proj/openrc:master commit in: src/librc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/librc/librc.c X-VCS-Directories: src/librc/ X-VCS-Committer: williamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 8fcaba9a22ac0deda7dc6a8d5f270d1df08f9966 Date: Thu, 28 Apr 2011 00:18:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: e84c838340d53ce8cd533b08de945dcb commit: 8fcaba9a22ac0deda7dc6a8d5f270d1df08f9966 Author: James Le Cuirot aura-online co uk> AuthorDate: Wed Apr 20 10:55:06 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed Apr 27 20:27:16 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D8fcaba9a fix rc_service_extra_commands return value If there were no extra commands, rc_service_extra_commands returned a list containing a single empty string. This changes that to return an empty list, which is more consistent with what you would expect. X-Gentoo-Bug: 360013 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=3D360013 --- src/librc/librc.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/librc/librc.c b/src/librc/librc.c index f2f694d..5feb5d7 100644 --- a/src/librc/librc.c +++ b/src/librc/librc.c @@ -550,14 +550,16 @@ rc_service_extra_commands(const char *service) if ((fp =3D popen(cmd, "r"))) { rc_getline(&buffer, &len, fp); p =3D buffer; - while ((token =3D strsep(&p, " "))) { - if (!commands) - commands =3D rc_stringlist_new(); - rc_stringlist_add(commands, token); - } + commands =3D rc_stringlist_new(); + + while ((token =3D strsep(&p, " "))) + if (token[0] !=3D '\0') + rc_stringlist_add(commands, token); + pclose(fp); free(buffer); } + free(cmd); return commands; }