* Fixed haserl-lua Makefile

[project/luci.git] / src / ffluci / fs.lua

diff --git a/src/ffluci/fs.lua b/src/ffluci/fs.lua
index 1896122..6e8859a 100644 (file)
--- a/src/ffluci/fs.lua
+++ b/src/ffluci/fs.lua
@@ -40,7 +40,7 @@ function readfile(filename)
        local fp, err = io.open(filename)
        
        if fp == nil then
-               error(err)
+               return nil, err
        end
        
        local data = fp:read("*a")
@@ -55,7 +55,7 @@ function readfilel(filename)
        local data = {}
                
        if fp == nil then
-               error(err)
+               return nil, err
        end
        
        while true do
@@ -71,11 +71,15 @@ end
 -- Writes given data to a file
 function writefile(filename, data)
        local fp, err = io.open(filename, "w")
+       
        if fp == nil then
-               error(err)
+               return nil, err
        end
+       
        fp:write(data)
        fp:close()
+       
+       return true
 end
 
 -- Returns the file modification date/time of "path"
@@ -84,24 +88,19 @@ function mtime(path)
 end
 
 -- basename wrapper
-function basename(path)
-       return posix.basename(path)
-end
+basename = posix.basename
 
 -- dirname wrapper
-function dirname(path)
-       return posix.dirname(path)
-end
+dirname = posix.dirname
 
--- Diriterator - alias for lfs.dir - filter . and ..
+-- dir wrapper
 function dir(path)
-       local e = posix.dir(path)
-       table.remove(e, 1)
-       table.remove(e, 1)
-       return e
+       local dir = {}
+       for node in posix.files(path) do
+               table.insert(dir, 1, node)
+       end 
+       return dir
 end
 
 -- Alias for lfs.mkdir
-function mkdir(...)
-       return posix.mkdir(...)
-end
\ No newline at end of file
+mkdir = posix.mkdir
\ No newline at end of file