util: run function

3 files changed, 19 insertions, 11 deletions

diff --git a/awall-cli b/awall-cli
index 0786709..a853a57 100755
--- a/awall-cli
+++ b/awall-cli
@@ -340,11 +340,7 @@ if not call(
 		  end
 	       )
 	    end
-
-	    local stdio, stdout
-	    pid, stdio, stdout = lpc.run(arg[0], 'fallback')
-	    stdio:close()
-	    stdout:close()
+	    pid = util.run(arg[0], 'fallback')
 	 end
 
 	 local function kill()
diff --git a/awall/ipset.lua b/awall/ipset.lua
index 5f7b9b3..9f927c0 100644
--- a/awall/ipset.lua
+++ b/awall/ipset.lua
@@ -1,6 +1,6 @@
 --[[
 Ipset file dumper for Alpine Wall
-Copyright (C) 2012-2016 Kaarle Ritvanen
+Copyright (C) 2012-2019 Kaarle Ritvanen
 See LICENSE file for license details
 ]]--
 
@@ -20,10 +20,11 @@ end
 
 function IPSet:create()
    for name, ipset in pairs(self.config) do
-      local pid = lpc.run(
-	 'ipset', '-!', 'create', name, table.unpack(ipset.options)
-      )
-      if lpc.wait(pid) ~= 0 then
+      if not lpc.wait(
+	 util.run(
+	    'ipset', '-!', 'create', name, table.unpack(ipset.options)
+	 )
+      ) ~= 0 then
 	 util.printmsg('ipset creation failed: '..name)
       end
    end
diff --git a/awall/util.lua b/awall/util.lua
index df6579a..ad067b7 100644
--- a/awall/util.lua
+++ b/awall/util.lua
@@ -1,12 +1,15 @@
 --[[
 Utility module for Alpine Wall
-Copyright (C) 2012-2017 Kaarle Ritvanen
+Copyright (C) 2012-2019 Kaarle Ritvanen
 See LICENSE file for license details
 ]]--
 
 
 local M = {}
 
+local lpc = require('lpc')
+
+
 function M.split(s, sep)
    if s == '' then return {} end
    local res = {}
@@ -150,4 +153,12 @@ function M.printtabular(tbl) M.printtabulars({tbl}) end
 
 function M.printmsg(msg) io.stderr:write(msg..'\n') end
 
+
+function M.run(...)
+   local pid, stdin, stdout = lpc.run(...)
+   stdin:close()
+   stdout:close()
+   return pid
+end
+
 return M