Remove all calls to 'module' in preparation for move to Lua 5.2

Use mymodule parameter for module definition.
This was also helpful in revealing places where the code relied on the global environment.

1 files changed, 42 insertions, 40 deletions

diff --git a/fs.lua b/fs.lua
index ed4f72e..7b39b15 100644
--- a/fs.lua
+++ b/fs.lua
@@ -5,43 +5,43 @@
         MM edited to use "posix"
 ]]--
 
-module (..., package.seeall)
+local mymodule = {}
 
 posix = require("posix")
 format = require("acf.format")
 
 -- generic wrapper funcs
-function is_dir ( pathstr )
+function mymodule.is_dir ( pathstr )
 	return posix.stat ( pathstr or "", "type" ) == "directory"
 end
 
-function is_file ( pathstr )
+function mymodule.is_file ( pathstr )
 	return posix.stat ( pathstr or "", "type" ) == "regular"
 end
 
-function is_link ( pathstr )
+function mymodule.is_link ( pathstr )
 	return posix.stat ( pathstr or "", "type" ) == "link"
 end
 
 -- Creates a directory if it doesn't exist, including the parent dirs
-function create_directory ( path )
+function mymodule.create_directory ( path )
 	local pos = string.find(path, "/")
 	while pos do
 		posix.mkdir(string.sub(path, 1, pos))
 		pos = string.find(path, "/", pos+1)
 	end
 	posix.mkdir(path)
-	return is_dir(path)
+	return mymodule.is_dir(path)
 end
 
 -- Deletes a directory along with its contents
-function remove_directory ( path )
-	if is_dir(path) then
+function mymodule.remove_directory ( path )
+	if mymodule.is_dir(path) then
 		for d in posix.files(path) do
 			if (d == ".") or (d == "..") then
 				-- ignore
-			elseif is_dir(path .. "/" ..  d) then
-				remove_directory(path .. "/" ..d)
+			elseif mymodule.is_dir(path .. "/" ..  d) then
+				mymodule.remove_directory(path .. "/" ..d)
 			else
 				os.remove(path .. "/" ..d)
 			end
@@ -53,16 +53,16 @@ function remove_directory ( path )
 end
 
 -- Creates a blank file (and the directory if necessary)
-function create_file ( path )
+function mymodule.create_file ( path )
 	path = path or ""
-	if not posix.stat(posix.dirname(path)) then create_directory(posix.dirname(path)) end
+	if not posix.stat(posix.dirname(path)) then mymodule.create_directory(posix.dirname(path)) end
 	local f = io.open(path, "w")
 	if f then f:close() end
-	return is_file(path)
+	return mymodule.is_file(path)
 end
 
 -- Copies the permissions and ownership of one file to another (if they exist and are the same type)
-function copy_properties(source, dest)
+function mymodule.copy_properties(source, dest)
 	if posix.stat(source or "", "type") == posix.stat(dest or "", "type") then
 		local stats = posix.stat(source)
 		posix.chmod(dest, stats.mode)
@@ -75,39 +75,39 @@ end
 -- Copies a file to a directory or new filename (creating the directory if necessary)
 -- fails if new file is already a directory (this is different than cp function)
 -- if newpath ends in "/", will treat as a directory
-function copy_file(oldpath, newpath)
+function mymodule.copy_file(oldpath, newpath)
 	local use_dir = string.find(newpath or "", "/%s*$")
-	if not is_file(oldpath) or not newpath or newpath == "" or (not use_dir and is_dir(newpath)) or (use_dir and is_dir(newpath .. posix.basename(oldpath))) then
+	if not mymodule.is_file(oldpath) or not newpath or newpath == "" or (not use_dir and mymodule.is_dir(newpath)) or (use_dir and mymodule.is_dir(newpath .. posix.basename(oldpath))) then
 		return false
 	end
 	if use_dir then newpath = newpath .. posix.basename(oldpath) end
-	if not posix.stat(posix.dirname(newpath)) then create_directory(posix.dirname(newpath)) end
+	if not posix.stat(posix.dirname(newpath)) then mymodule.create_directory(posix.dirname(newpath)) end
 	local old = io.open(oldpath, "r")
 	local new = io.open(newpath, "w")
 	new:write(old:read("*a"))
 	new:close()
 	old:close()
-	copy_properties(oldpath, newpath)
-	return is_file(newpath)
+	mymodule.copy_properties(oldpath, newpath)
+	return mymodule.is_file(newpath)
 end
 
 -- Moves a file to a directory or new filename (creating the directory if necessary)
 -- fails if new file is already a directory (this is different than mv function)
 -- if newpath ends in "/", will treat as a directory
-function move_file(oldpath, newpath)
+function mymodule.move_file(oldpath, newpath)
 	local use_dir = string.find(newpath or "", "/%s*$")
-	if not is_file(oldpath) or not newpath or newpath == "" or (not use_dir and is_dir(newpath)) or (use_dir and is_dir(newpath .. posix.basename(oldpath))) then
+	if not mymodule.is_file(oldpath) or not newpath or newpath == "" or (not use_dir and mymodule.is_dir(newpath)) or (use_dir and mymodule.is_dir(newpath .. posix.basename(oldpath))) then
 		return false
 	end
 	if use_dir then newpath = newpath .. posix.basename(oldpath) end
-	if not posix.stat(posix.dirname(newpath)) then create_directory(posix.dirname(newpath)) end
+	if not posix.stat(posix.dirname(newpath)) then mymodule.create_directory(posix.dirname(newpath)) end
 	local status, errstr, errno = os.rename(oldpath, newpath)
         -- errno 18 means  Invalid cross-device link
 	if status or errno ~= 18 then
 		-- successful move or failure due to something else
 		return (status ~= nil), errstr, errno
 	else
-		status = copy_file(oldpath, newpath)
+		status = mymodule.copy_file(oldpath, newpath)
 		if status then
 			os.remove(oldpath)
 		end
@@ -116,7 +116,7 @@ function move_file(oldpath, newpath)
 end
 
 -- Returns the contents of a file as a string
-function read_file ( path )
+function mymodule.read_file ( path )
 	local file = io.open(path or "")
 	if ( file ) then
 		local f = file:read("*a")
@@ -129,7 +129,7 @@ end
 
 -- Returns an array with the contents of a file, 
 -- or nil and the error message
-function read_file_as_array ( path )
+function mymodule.read_file_as_array ( path )
 	local file, error = io.open(path or "")
 	if ( file == nil ) then
 		return nil, error
@@ -144,9 +144,9 @@ function read_file_as_array ( path )
 end
 	
 -- write a string to a file, will replace file contents
-function write_file ( path, str )
+function mymodule.write_file ( path, str )
 	path = path or ""
-	if not posix.stat(posix.dirname(path)) then create_directory(posix.dirname(path)) end
+	if not posix.stat(posix.dirname(path)) then mymodule.create_directory(posix.dirname(path)) end
 	local file = io.open(path, "w")
 	--append a newline char to EOF
 	str = string.gsub(str or "", "\n*$", "\n")
@@ -158,39 +158,39 @@ end
 
 -- this could do more than a line. This will append
 -- fs.write_line_file ("filename", "Line1 \nLines2 \nLines3")
-function write_line_file ( path, str )
+function mymodule.write_line_file ( path, str )
 	path = path or ""
-	if not posix.stat(posix.dirname(path)) then create_directory(posix.dirname(path)) end
+	if not posix.stat(posix.dirname(path)) then mymodule.create_directory(posix.dirname(path)) end
 	local file = io.open(path)
 	if ( file) then
 		local c = file:read("*a") or ""
 		file:close()
-		write_file(path, c .. (str or ""))
+		mymodule.write_file(path, c .. (str or ""))
 	end
 end
 
 -- returns an array of files under "where" that match "what" (a Lua pattern)
-function find_files_as_array ( what, where, follow, t )
+function mymodule.find_files_as_array ( what, where, follow, t )
 	where = where or posix.getcwd()
 	what = what or ".*"
 	t =  t or {}
 	
 	local link
-	if follow and is_link(where) then
+	if follow and mymodule.is_link(where) then
 		link = posix.readlink(where)
 		if link and not string.find(link, "^/") then
 			link = posix.dirname(where).."/"..link
 		end
 	end
 
-	if is_dir(where) or (link and is_dir(link)) then
+	if mymodule.is_dir(where) or (link and mymodule.is_dir(link)) then
 		for d in posix.files ( where ) do
 			if (d == ".") or ( d == "..") then
 				-- do nothing
-			elseif is_dir ( where .. "/" ..  d ) then
-				find_files_as_array (what, where .. "/" .. d, follow, t )
-			elseif follow and is_link ( where .. "/" ..  d ) then
-				find_files_as_array (what, where .. "/" .. d, follow, t )
+			elseif mymodule.is_dir ( where .. "/" ..  d ) then
+				mymodule.find_files_as_array (what, where .. "/" .. d, follow, t )
+			elseif follow and mymodule.is_link ( where .. "/" ..  d ) then
+				mymodule.find_files_as_array (what, where .. "/" .. d, follow, t )
 			elseif (string.match (d, "^" .. what .. "$" ))  then
 				table.insert (t, ( string.gsub ( where .. "/" .. d, "/+", "/" ) ) )
 			end
@@ -204,8 +204,8 @@ end
 
 -- iterator function for finding dir entries matching (what) (a Lua pattern)
 -- starting at where, or currentdir if not specified.
-function find ( what, where, follow )
-	local t = find_files_as_array ( what, where, follow )
+function mymodule.find ( what, where, follow )
+	local t = mymodule.find_files_as_array ( what, where, follow )
 	local idx = 0
 	return function () 
 		idx = idx + 1
@@ -214,7 +214,7 @@ function find ( what, where, follow )
 end
 
 -- This function does almost the same as posix.stat, but instead it writes the output human readable.
-function stat ( path )
+function mymodule.stat ( path )
 	local filedetails = posix.stat(path or "")
 	if (filedetails) then
 		filedetails["ctime"]=os.date("%c", filedetails["ctime"])
@@ -232,3 +232,5 @@ function stat ( path )
 	end
 	return filedetails
 end
+
+return mymodule