Changed to use posix instead of lfs

git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@302 ab2d0c66-481e-0410-8bed-d214d4d58bed

2 files changed, 13 insertions, 7 deletions

diff --git a/lib/fs.lua b/lib/fs.lua
index d171074..45901be 100644
--- a/lib/fs.lua
+++ b/lib/fs.lua
@@ -2,21 +2,27 @@
 	module for generic filesystem funcs
 
 	Copyright (c) Natanael Copa 2006
-
+        MM edited to use "posix"
 ]]--
 
 module (..., package.seeall)
 
-require ("lfs")
+require ("posix")
 
 -- generic wrapper funcs
 function is_dir ( pathstr )
-	return lfs.attributes ( pathstr, "mode" ) == "directory"
+	return posix.stat ( pathstr, "type" ) == "directory"
 end
 
 function is_file ( pathstr )
-	return lfs.attributes ( pathstr, "mode" ) == "file"
+	return posix.stat ( pathstr, "type" ) == "regular"
+end
+
+function is_link ( pathstr )
+	return posix.stat ( pathstr, "type" ) == "link"
 end
+
+
 	
 -- Returns the contents of a file as a string
 function read_file ( path )
@@ -64,10 +70,10 @@ end
 function find ( what, where )
 	-- returns an array of files under "where" that match what "f"
 	local function find_files_as_array ( f, where, t )
-		where = where or lfs.currentdir()
+		where = where or posix.getcwd()
 		f = f or ".*"
 		t =  t or {}
-		for d in lfs.dir ( where ) do
+		for d in posix.files ( where ) do
 			if fs.is_dir ( where .. "/" ..  d ) and (d ~= ".") and ( d ~= "..") then
 				find_files_as_array (f, where .. "/" .. d, t )
 			end
diff --git a/lib/service_model.lua b/lib/service_model.lua
index c619d61..3f81794 100644
--- a/lib/service_model.lua
+++ b/lib/service_model.lua
@@ -5,7 +5,7 @@ function create_service_model(cfglist, loglist, servlist, notepath)
 	local me = {}
 
 	local function get_any_pid(pname)
-		for e in lfs.dir("/proc") do
+		for e in posix.files("/proc") do
 			if e == string.match(e, "^%d*$") then
 				for line in io.lines("/proc/" .. e .. "/status") do
 					tag, val = string.match(line, "^([^:]*):%s*(%S*)$");