Merge pull request #2442 from Jarod42/os_findxxx

Fix findlib and findheader on windows

Author: nickclark2016

src/base/os.lua

@@ -63,44 +63,31 @@
 	end
 
 	local function get_library_search_path()
-		local path
 		if os.istarget("windows") then
-			path = os.getenv("PATH") or ""
+			return (os.getenv("PATH") or ""):explode(";")
 		elseif os.istarget("haiku") then
-			path = os.getenv("LIBRARY_PATH") or ""
+			return (os.getenv("LIBRARY_PATH") or ""):explode(":")
 		else
+			local paths
 			if os.istarget("darwin") then
-				path = os.getenv("DYLD_LIBRARY_PATH") or ""
+				paths = (os.getenv("DYLD_LIBRARY_PATH") or ""):explode(":")
 			else
-				path = os.getenv("LD_LIBRARY_PATH") or ""
+				paths = (os.getenv("LD_LIBRARY_PATH") or ""):explode(":")
 
 				for _, prefix in ipairs({"", "/opt"}) do
 					local conf_file = prefix .. "/etc/ld.so.conf"
 					if os.isfile(conf_file) then
-						for _, v in ipairs(parse_ld_so_conf(conf_file)) do
-							if (#path > 0) then
-								path = path .. ":" .. v
-							else
-								path = v
-							end
-						end
+						paths = table.join(paths, parse_ld_so_conf(conf_file))
 					end
 				end
 			end
 
-			path = path or ""
-			local archpath = "/lib:/usr/lib:/usr/local/lib"
+			local archpaths = {"/lib", "/usr/lib", "/usr/local/lib"}
 			if os.is64bit() and not (os.istarget("darwin")) then
-				archpath = "/lib64:/usr/lib64/:usr/local/lib64" .. ":" .. archpath
-			end
-			if (#path > 0) then
-				path = path .. ":" .. archpath
-			else
-				path = archpath
+				archpaths = table.join({"/lib64", "/usr/lib64/", "usr/local/lib64"}, archpaths)
 			end
+			return table.join(paths, archpaths)
 		end
-
-		return path
 	end
 
 
@@ -123,7 +110,7 @@
 --    The full path to the library if found; `nil` otherwise.
 ---
 	function os.findlib(libname, libdirs)
-		local path = get_library_search_path()
+		local paths = get_library_search_path()
 		local formats
 
 		-- assemble a search path, depending on the platform
@@ -141,25 +128,17 @@
 			table.insert(formats, "%s")
 		end
 
-		local userpath = ""
+		local userpaths = {}
 
 		if type(libdirs) == "string" then
-			userpath = libdirs
+			userpaths = {libdirs}
 		elseif type(libdirs) == "table" then
-			userpath = table.implode(libdirs, "", "", ":")
+			userpaths = libdirs
 		end
-
-		if (#userpath > 0) then
-			if (#path > 0) then
-				path = userpath .. ":" .. path
-			else
-				path = userpath
-			end
-		end
-
+		paths = table.join(userpaths, paths)
 		for _, fmt in ipairs(formats) do
 			local name = string.format(fmt, libname)
-			local result = os.pathsearch(name, path)
+			local result = os.pathsearch(name, table.unpack(paths))
 			if result then return result end
 		end
 	end
@@ -168,30 +147,21 @@
 		-- headerpath: a partial header file path
 		-- headerdirs: additional header search paths
 
-		local path = get_library_search_path()
+		local paths = get_library_search_path()
 
-		-- replace all /lib by /include
-		path = path .. ':'
-		path = path:gsub ('/lib[0-9]*([:/])', '/include%1')
-		path = path:sub (1, #path - 1)
+		-- replace all /lib and /bin by /include
+		paths = table.translate(paths, function (path) return path:gsub('[/\\]lib[0-9]*', '/include'):gsub('[/\\]bin', '/include') end)
 
-		local userpath = ""
+		local userpaths = {}
 
 		if type(headerdirs) == "string" then
-			userpath = headerdirs
+			userpaths = { headerdirs }
 		elseif type(headerdirs) == "table" then
-			userpath = table.implode(headerdirs, "", "", ":")
-		end
-
-		if (#userpath > 0) then
-			if (#path > 0) then
-				path = userpath .. ":" .. path
-			else
-				path = userpath
-			end
+			userpaths = headerdirs
 		end
+		paths = table.join(userpaths, paths)
 
-		local result = os.pathsearch (headerpath, path)
+		local result = os.pathsearch (headerpath, table.unpack(paths))
 		return result
 	end
 

tests/base/test_os.lua

@@ -17,6 +17,29 @@
 		os.chdir(cwd)
 	end
 
+	local function create_mock_os_getenv(map)
+		return function (key) return map[key] end
+	end
+
+	local function get_LD_PATH_variable_name()
+		if os.istarget("windows") then
+			return 'PATH'
+		elseif os.istarget("haiku") then
+			return 'LIBRARY_PATH'
+		elseif os.istarget("darwin") then
+			return 'DYLD_LIBRARY_PATH'
+		else
+			return 'LD_LIBRARY_PATH'
+		end
+	end
+
+	local function get_surrounded_env_path(dir)
+		if os.istarget("windows") then
+			return "c:\\anyPath;" .. path.getabsolute(dir) .. ";c:\\otherpath"
+		else
+			return "/any_path:" .. path.getabsolute(dir) .. ":/other_path"
+		end
+	end
 
 --
 -- os.findlib() tests
@@ -50,6 +73,20 @@
 		test.isfalse(os.findlib("NoSuchLibraryAsThisOneHere"))
 	end
 
+	function suite.findlib_provided()
+		test.isequal(path.getabsolute("folder/subfolder/lib"),
+					 os.findlib("test", path.getabsolute("folder/subfolder/lib")))
+	end
+
+	function suite.findlib_frompath()
+		local os_getenv = os.getenv
+		os.getenv = create_mock_os_getenv({ [get_LD_PATH_variable_name()] = get_surrounded_env_path("folder/subfolder/lib") })
+
+		test.isequal(path.getabsolute("folder/subfolder/lib"), os.findlib("test"))
+
+		os.getenv = os_getenv
+	end
+
 	function suite.findheader_stdheaders()
 		if not os.istarget("windows") and not os.istarget("macosx") then
 			test.istrue(os.findheader("stdlib.h"))
@@ -60,6 +97,28 @@
 		test.isfalse(os.findheader("Knights/who/say/Ni.hpp"))
 	end
 
+	function suite.findheader_provided()
+		test.isequal(path.getabsolute("folder/subfolder/include"),
+					 os.findheader("test.h", path.getabsolute("folder/subfolder/include")))
+	end
+
+	function suite.findheader_frompath_lib()
+		local os_getenv = os.getenv
+		os.getenv = create_mock_os_getenv({ [get_LD_PATH_variable_name()] = get_surrounded_env_path("folder/subfolder/lib") })
+
+		test.isequal(path.getabsolute("folder/subfolder/include"), os.findheader("test.h"))
+
+		os.getenv = os_getenv
+	end
+
+	function suite.findheader_frompath_bin()
+		local os_getenv = os.getenv
+		os.getenv = create_mock_os_getenv({ [get_LD_PATH_variable_name()] = get_surrounded_env_path("folder/subfolder/bin") })
+
+		test.isequal(path.getabsolute("folder/subfolder/include"), os.findheader("test.h"))
+
+		os.getenv = os_getenv
+	end
 
 --
 -- os.isfile() tests

tests/folder/subfolder/include/test.h

@@ -0,0 +1 @@
+// Only used for presence in tests

tests/folder/subfolder/lib/test.dll

@@ -0,0 +1 @@
+Only used for presence in tests

tests/folder/subfolder/lib/test.dylib

@@ -0,0 +1 @@
+Only used for presence in tests

tests/folder/subfolder/lib/test.so

@@ -0,0 +1 @@
+Only used for presence in tests