projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c939a79
)
Optimized uvl.validation
author
Steven Barth
<steven@midlink.org>
Tue, 9 Sep 2008 15:39:30 +0000
(15:39 +0000)
committer
Steven Barth
<steven@midlink.org>
Tue, 9 Sep 2008 15:39:30 +0000
(15:39 +0000)
libs/uvl/luasrc/uvl/validation.lua
patch
|
blob
|
history
diff --git
a/libs/uvl/luasrc/uvl/validation.lua
b/libs/uvl/luasrc/uvl/validation.lua
index
50f9da0
..
90fde64
100644
(file)
--- a/
libs/uvl/luasrc/uvl/validation.lua
+++ b/
libs/uvl/luasrc/uvl/validation.lua
@@
-14,26
+14,28
@@
$Id$
]]--
]]--
-module( "luci.uvl.validation", package.seeall )
+local os = require "os"
+local fs = require "luci.fs"
+local sys = require "luci.sys"
+local ERR = require "luci.uvl.errors"
-require("luci.fs")
-require("luci.sys")
+local ipairs, unpack, type, tostring = ipairs, unpack, type, tostring
-local ERR = luci.uvl.errors
+module "luci.uvl.validation"
function _exec( bin, args )
local cmd, output = "", nil
for _, v in ipairs({ bin, unpack(args) }) do
function _exec( bin, args )
local cmd, output = "", nil
for _, v in ipairs({ bin, unpack(args) }) do
- cmd = cmd ..
string.format("%q ",
v):gsub("([%$`])","\\%1")
+ cmd = cmd ..
("%q " %
v):gsub("([%$`])","\\%1")
end
end
- local tmpfile = "/tmp/uvl" ..
luci.
sys.uniqueid(8)
+ local tmpfile = "/tmp/uvl" .. sys.uniqueid(8)
local retval = os.execute( cmd .. " 1>" .. tmpfile .. " 2>" .. tmpfile )
local retval = os.execute( cmd .. " 1>" .. tmpfile .. " 2>" .. tmpfile )
- if
luci.
fs.access(tmpfile) then
- output =
luci.
fs.readfile(tmpfile)
-
luci.
fs.unlink(tmpfile)
+ if fs.access(tmpfile) then
+ output = fs.readfile(tmpfile)
+ fs.unlink(tmpfile)
end
return retval, output
end
return retval, output