system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-06 17:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

lualoader config: don't call loader.getenv() as much

Browse source 
We don't actually need to fetch loader_conf_files as much as we do; we've
already fetched it once at the beginning, we only really need to fetch it
again after each file we've processed. If it changes, then we can stash that
off into our local prefiles.

While here, drop a note about the recursion so that I stop trying to
change it. It may very well make redundant some of the work we're doing, but
that's OK.

MFC after:	3 days
This commit is contained in:
Kyle Evans 2020-04-28 01:39:34 +00:00
parent b8040914bf
commit ecacf5ff1e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=360420
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
stand/lua/config.lua
View file

@ -343,13 +343,12 @@ end
local function readConfFiles(loaded_files)
local f = loader.getenv("loader_conf_files")
if f ~= nil then
local prefiles = f
for name in f:gmatch("([%w%p]+)%s*") do
if loaded_files[name] ~= nil then
goto continue
end
local prefiles = loader.getenv("loader_conf_files")
print("Loading " .. name)
-- These may or may not exist, and that's ok. Do a
-- silent parse so that we complain on parse errors but
@ -361,7 +360,12 @@ local function readConfFiles(loaded_files)
loaded_files[name] = true
local newfiles = loader.getenv("loader_conf_files")
if prefiles ~= newfiles then
-- Recurse; process the new files immediately.
-- If we come back and it turns out we've
-- already loaded the rest of what was in the
-- original loader_conf_files, no big deal.
readConfFiles(loaded_files)
prefiles = newfiles
end
::continue::
end