diff options
| author | Steven Barth <steven@midlink.org> | 2008-09-09 15:39:30 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-09-09 15:39:30 +0000 |
| commit | 1bfd6b667b1169715fb4e1003e488c72b25080d5 (patch) | |
| tree | 91f533422313ab563089ca24442c68741afcef67 /libs/uvl | |
| parent | c939a799cefc729fbc672991415987aa0aa6a480 (diff) | |
Optimized uvl.validation
Diffstat (limited to 'libs/uvl')
| -rw-r--r-- | libs/uvl/luasrc/uvl/validation.lua | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libs/uvl/luasrc/uvl/validation.lua b/libs/uvl/luasrc/uvl/validation.lua index 50f9da0cd..90fde64f1 100644 --- 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 - cmd = cmd .. string.format("%q ",v):gsub("([%$`])","\\%1") + cmd = cmd .. ("%q " % v):gsub("([%$`])","\\%1") 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 ) - 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 |