From: Daniel Dickinson <openwrt@daniel.thecshore.com>
Date: Tue, 29 Mar 2016 14:18:22 +0000 (-0400)
Subject: luci-base: utils: Make checklib return a boolean
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=refs%2Fpull%2F698%2Fhead;p=oweals%2Fluci.git

luci-base: utils: Make checklib return a boolean

Using tristate is counter-intuitive and probably doesn't provide a lot
of benefit so we use a boolean and treat "don't know" as false (because
it is safer than showing options that are not actually available).

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
---

diff --git a/modules/luci-base/luasrc/util.lua b/modules/luci-base/luasrc/util.lua
index d614a6c79..896e36b45 100644
--- a/modules/luci-base/luasrc/util.lua
+++ b/modules/luci-base/luasrc/util.lua
@@ -640,18 +640,18 @@ function checklib(fullpathexe, wantedlib)
 	local fs = require "nixio.fs"
 	local haveldd = fs.access('/usr/bin/ldd')
 	if not haveldd then
-		return -1
+		return false
 	end
 	local libs = exec("/usr/bin/ldd " .. fullpathexe)
 	if not libs then
-		return 0
+		return false
 	end
 	for k, v in ipairs(split(libs)) do
 		if v:find(wantedlib) then
-			return 1
+			return true
 		end
 	end
-	return 0
+	return false
 end
 
 --