From 8fcd841aa9af96c8a4a4d3c1a555d2d1ed42332c Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 19 Jul 2009 00:24:58 +0000
Subject: convert luci.fs users to nixio.fs api

---
 libs/web/luasrc/sauth.lua | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'libs/web/luasrc/sauth.lua')

diff --git a/libs/web/luasrc/sauth.lua b/libs/web/luasrc/sauth.lua
index e5cb17845..8ae24a541 100644
--- a/libs/web/luasrc/sauth.lua
+++ b/libs/web/luasrc/sauth.lua
@@ -15,7 +15,6 @@ $Id$
 
 --- LuCI session library.
 module("luci.sauth", package.seeall)
-require("luci.fs")
 require("luci.util")
 require("luci.sys")
 require("luci.config")
@@ -30,17 +29,17 @@ sessiontime = tonumber(luci.config.sauth.sessiontime) or 15 * 60
 --- Manually clean up expired sessions.
 function clean()
 	local now   = os.time()
-	local files = luci.fs.dir(sessionpath)
+	local files = fs.dir(sessionpath)
 	
 	if not files then
 		return nil
 	end
 	
-	for i, file in pairs(files) do
+	for file in files do
 		local fname = sessionpath .. "/" .. file
-		local stat = luci.fs.stat(fname)
+		local stat = fs.stat(fname)
 		if stat and stat.type == "reg" and stat.mtime + sessiontime < now then
-			luci.fs.unlink(fname)
+			fs.unlink(fname)
 		end 
 	end
 end
@@ -68,8 +67,8 @@ function read(id)
 	if not sane(sessionpath .. "/" .. id) then
 		return
 	end
-	luci.fs.utime(sessionpath .. "/" .. id)
-	return luci.fs.readfile(sessionpath .. "/" .. id)
+	fs.utimes(sessionpath .. "/" .. id)
+	return fs.readfile(sessionpath .. "/" .. id)
 end
 
 
@@ -77,8 +76,8 @@ end
 -- @return Boolean status
 function sane(file)
 	return luci.sys.process.info("uid")
-			== luci.fs.stat(file or sessionpath, "uid")
-		and luci.fs.stat(file or sessionpath, "modestr")
+			== fs.stat(file or sessionpath, "uid")
+		and fs.stat(file or sessionpath, "modestr")
 			== (file and "rw-------" or "rwx------")
 end
 
@@ -106,5 +105,5 @@ function kill(id)
 	if not id:match("^%w+$") then
 		error("Session ID is not sane!")
 	end
-	luci.fs.unlink(sessionpath .. "/" .. id)
-end
\ No newline at end of file
+	fs.unlink(sessionpath .. "/" .. id)
+end
-- 
cgit v1.2.3