From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 97E1658973 for ; Tue, 19 Jan 2016 06:12:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D286421C10B; Tue, 19 Jan 2016 06:12:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 03DDE21C10C for ; Tue, 19 Jan 2016 06:12:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4BB243409EC for ; Tue, 19 Jan 2016 06:12:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CAD25102A for ; Tue, 19 Jan 2016 06:12:20 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1453183760.4c814a0a285565bc09d662f602f93dbb938503c6.williamh@OpenRC> 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: 4c814a0a285565bc09d662f602f93dbb938503c6 X-VCS-Branch: master Date: Tue, 19 Jan 2016 06:12:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5b775f6c-0280-4620-9846-55c151eabe6b X-Archives-Hash: 3a9a0be717f7bffa75fce1d461c93551 commit: 4c814a0a285565bc09d662f602f93dbb938503c6 Author: Doug Freed mtu edu> AuthorDate: Mon Jan 18 06:39:11 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Jan 19 06:09:20 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=4c814a0a librc: handle rc_sys="prefix" even if we weren't built with a prefix This probably isn't needed, but it mimics old behavior. src/librc/librc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/librc/librc.c b/src/librc/librc.c index 8b4e8d4..3e1f0d8 100644 --- a/src/librc/librc.c +++ b/src/librc/librc.c @@ -220,6 +220,13 @@ detect_prefix(const char *systype) #ifdef PREFIX return RC_SYS_PREFIX; #else + if (systype) { + if (strcmp(systype, RC_SYS_NONE) == 0) + return NULL; + if (strcmp(systype, RC_SYS_PREFIX) == 0) + return RC_SYS_PREFIX; + } + return NULL; #endif }