# HG changeset patch # User jbe # Date 1334668842 -7200 # Node ID a54cc7dcabf15e35bc6bc63a03971b880aece3e2 # Parent 3d43a5cf17c1c263d52c15b8a5a73ac7bf233f97 "extos" library calls via "extos." instead of "os." diff -r 3d43a5cf17c1 -r a54cc7dcabf1 framework/bin/langtool.lua --- a/framework/bin/langtool.lua Sun Apr 15 16:04:33 2012 +0200 +++ b/framework/bin/langtool.lua Tue Apr 17 15:20:42 2012 +0200 @@ -64,7 +64,7 @@ end end -if #directories > 0 and not os.listdir then +if #directories > 0 and not extos.listdir then io.stderr:write('Fatal: Cannot traverse directories without "extos" library -> Abort\n') os.exit(1) end @@ -81,7 +81,7 @@ local translations = { } local function traverse(path) - local filenames = os.listdir(path) + local filenames = extos.listdir(path) if not filenames then return false end for num, filename in ipairs(filenames) do if not string.find(filename, "^%.") then diff -r 3d43a5cf17c1 -r a54cc7dcabf1 framework/cgi-bin/webmcp.lua --- a/framework/cgi-bin/webmcp.lua Sun Apr 15 16:04:33 2012 +0200 +++ b/framework/cgi-bin/webmcp.lua Tue Apr 17 15:20:42 2012 +0200 @@ -387,7 +387,7 @@ if not success then trace.error{} end -- laufzeitermittlung -trace.exectime{ real = os.monotonic_hires_time(), cpu = os.clock() } +trace.exectime{ real = extos.monotonic_hires_time(), cpu = os.clock() } slot.select('trace', trace.render) -- render trace information diff -r 3d43a5cf17c1 -r a54cc7dcabf1 framework/env/auth/openid/_curl.lua --- a/framework/env/auth/openid/_curl.lua Sun Apr 15 16:04:33 2012 +0200 +++ b/framework/env/auth/openid/_curl.lua Tue Apr 17 15:20:42 2012 +0200 @@ -6,7 +6,7 @@ local options = table.new(curl_options) options[#options+1] = "-i" options[#options+1] = url - local stdout, errmsg, status = os.pfilter(nil, "curl", table.unpack(options)) + local stdout, errmsg, status = extos.pfilter(nil, "curl", table.unpack(options)) if not stdout then error("Error while executing curl: " .. errmsg) end diff -r 3d43a5cf17c1 -r a54cc7dcabf1 framework/env/execute/_add_filters_by_path.lua --- a/framework/env/execute/_add_filters_by_path.lua Sun Apr 15 16:04:33 2012 +0200 +++ b/framework/env/execute/_add_filters_by_path.lua Tue Apr 17 15:20:42 2012 +0200 @@ -1,7 +1,7 @@ function execute._add_filters_by_path(filter_list, ...) local full_path = encode.file_path(request.get_app_basepath(), "app", ...) local relative_path = encode.file_path("", ...) - local filter_names = os.listdir(full_path) + local filter_names = extos.listdir(full_path) if filter_names then table.sort(filter_names) -- not really neccessary, due to sorting afterwards for i, filter_name in ipairs(filter_names) do diff -r 3d43a5cf17c1 -r a54cc7dcabf1 framework/env/net/send_mail.lua --- a/framework/env/net/send_mail.lua Sun Apr 15 16:04:33 2012 +0200 +++ b/framework/env/net/send_mail.lua Tue Apr 17 15:20:42 2012 +0200 @@ -46,7 +46,7 @@ command[#command+1] = "-f" command[#command+1] = envelope_from end - local stdout, errmsg, status = os.pfilter(mail, table.unpack(command)) + local stdout, errmsg, status = extos.pfilter(mail, table.unpack(command)) if not status then error("Error while calling sendmail: " .. errmsg) end diff -r 3d43a5cf17c1 -r a54cc7dcabf1 framework/env/trace/_render_sub_tree.lua --- a/framework/env/trace/_render_sub_tree.lua Sun Apr 15 16:04:33 2012 +0200 +++ b/framework/env/trace/_render_sub_tree.lua Tue Apr 17 15:20:42 2012 +0200 @@ -140,7 +140,7 @@ open_head() slot.put( "Finished after " .. - string.format("%.1f", os.monotonic_hires_time() * 1000) .. + string.format("%.1f", extos.monotonic_hires_time() * 1000) .. ' ms (' .. string.format("%.1f", os.clock() * 1000) .. ' ms CPU)'