redo/BlockLua
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

bug and warning fixes from auios

Browse Source
This commit is contained in:
Redo
2025-10-03 19:32:54 -05:00
parent 34345a7eeb
commit 9c349a9352
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
BlockLua.dll
View File

Binary file not shown.

2
lualib/ltn12.lua
View File

@@ -38,7 +38,7 @@ end
-- chains a bunch of filters together -- chains a bunch of filters together
-- (thanks to Wim Couwenberg) -- (thanks to Wim Couwenberg)
function filter.chain(...) function filter.chain(...)
local n = table.getn(arg) local n = #arg
local top, index = 1, 1 local top, index = 1, 1
local retry = "" local retry = ""
return function(chunk) return function(chunk)

4
lualib/socket/url.lua
View File

@@ -254,7 +254,7 @@ function parse_path(path)
path = path or "" path = path or ""
--path = string.gsub(path, "%s", "") --path = string.gsub(path, "%s", "")
string.gsub(path, "([^/]+)", function (s) table.insert(parsed, s) end) string.gsub(path, "([^/]+)", function (s) table.insert(parsed, s) end)
for i = 1, table.getn(parsed) do for i = 1, #parsed do
parsed[i] = unescape(parsed[i]) parsed[i] = unescape(parsed[i])
end end
if string.sub(path, 1, 1) == "/" then parsed.is_absolute = 1 end if string.sub(path, 1, 1) == "/" then parsed.is_absolute = 1 end
@@ -272,7 +272,7 @@ end
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
function build_path(parsed, unsafe) function build_path(parsed, unsafe)
local path = "" local path = ""
local n = table.getn(parsed) local n = #parsed
if unsafe then if unsafe then
for i = 1, n-1 do for i = 1, n-1 do
path = path .. parsed[i] path = path .. parsed[i]

10
src/util/libbl.lua
View File

@@ -466,7 +466,7 @@ local tsMeta = {
elseif name:find('::') then elseif name:find('::') then
local ns, rest = name:match('^([^:]+)::(.+)$') local ns, rest = name:match('^([^:]+)::(.+)$')
if not ns then error('ts index: invalid name \''..name..'\'', 2) end if not ns then error('ts index: invalid name \''..name..'\'', 2) end
if not rest:find('::') and tsIsFunction(ns, rest) then if not rest:find('::') and tsIsFunctionNs(ns, rest) then
error('ts index: can\'t call a namespaced function from lua', 2) error('ts index: can\'t call a namespaced function from lua', 2)
else else
return valFromTs(_bllua_ts.getvar(name), name) return valFromTs(_bllua_ts.getvar(name), name)
@@ -555,9 +555,9 @@ function bl.schedule(time, cb, ...)
return sch return sch
end end
function _bllua_schedule_callback(id) function _bllua_schedule_callback(id)
id = tonumber(id) id = tonumber(id) or error('_bllua_schedule_callback: invalid id: '..tostring(id))
local sch = bl._scheduleTable[id] local sch = bl._scheduleTable[id]
if not sch then error('_ts_schedule_callback: no schedule with id '..id) end if not sch then error('_bllua_schedule_callback: no schedule with id '..id) end
bl._scheduleTable[id] = nil bl._scheduleTable[id] = nil
sch.callback(unpack(sch.args)) sch.callback(unpack(sch.args))
end end
@@ -673,7 +673,7 @@ function bl.unhook(pkg, name, time)
if bl._hooks[pkg][name] then if bl._hooks[pkg][name] then
if not time then if not time then
bl._hooks[pkg][name] = nil bl._hooks[pkg][name] = nil
if table.isempty(bl._hooks[pkg]) then if table.empty(bl._hooks[pkg]) then
bl._hooks[pkg] = nil bl._hooks[pkg] = nil
deactivatePackage(pkg) deactivatePackage(pkg)
end end
@@ -683,7 +683,7 @@ function bl.unhook(pkg, name, time)
error('bl.unhook: argument #3: time must be nil or one of '.. error('bl.unhook: argument #3: time must be nil or one of '..
'\'before\' \'after\' \'override\'', 2) end '\'before\' \'after\' \'override\'', 2) end
bl._hooks[pkg][name][time] = nil bl._hooks[pkg][name][time] = nil
if table.isempty(bl._hooks[pkg][name]) and table.empty(bl._hooks[pkg]) then if table.empty(bl._hooks[pkg][name]) and table.empty(bl._hooks[pkg]) then
bl._hooks[pkg] = nil bl._hooks[pkg] = nil
deactivatePackage(pkg) deactivatePackage(pkg)
end end

4
src/util/libts.lua
View File

@@ -116,13 +116,13 @@ function io.open(fn, mode, errn)
local relfn = curfn and fn:find('^%./') and local relfn = curfn and fn:find('^%./') and
curfn:gsub('[^/]+$', '')..fn:gsub('^%./', '') curfn:gsub('[^/]+$', '')..fn:gsub('^%./', '')
if relfn then if relfn then
local fi, err = io_open_absolute(relfn, mode, errn+1) local fi, err = io_open_absolute(relfn, mode)
return fi, err, relfn return fi, err, relfn
else else
return nil, 'Invalid path', fn return nil, 'Invalid path', fn
end end
else else
local fi, err = io_open_absolute(fn, mode, errn+1) local fi, err = io_open_absolute(fn, mode)
return fi, err, fn return fi, err, fn
end end
end end