Packaging version 1.4.2

Bug report and patch by Aaron B.

Makefile

@@ -1,41 +1,22 @@
-# $Id: Makefile,v 1.19 2005/05/30 17:54:49 uid20006 Exp $
+# $Id: Makefile,v 1.35 2008/12/12 13:26:37 carregal Exp $
 
 T= lfs
 
-include ./config
+CONFIG= ./config
 
-V= 1.1
+include $(CONFIG)
-DIST_DIR= luafilesystem-$V
-TAR_FILE= $(DIST_DIR).tar.gz
-ZIP_FILE= $(DIST_DIR).zip
-LIBNAME= lib$T.$V.so
 
-COMPAT_O= $(COMPAT_DIR)/compat-5.1.o
 SRCS= src/$T.c
-OBJS= src/$T.o $(COMPAT_O)
+OBJS= src/$T.o
 
+lib: src/lfs.so
 
-lib: src/$(LIBNAME)
+src/lfs.so: $(OBJS)
+	MACOS_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/lfs.so $(OBJS)
 
-src/$(LIBNAME): $(OBJS)
+install:
-	$(CC) $(CFLAGS) $(LIBS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS)
-
-$(COMPAT_O): $(COMPAT_DIR)/compat-5.1.c
-	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
-
-install: src/$(LIBNAME)
 	mkdir -p $(LUA_LIBDIR)
-	cp src/$(LIBNAME) $(LUA_LIBDIR)
+	cp src/lfs.so $(LUA_LIBDIR)
-	ln -f -s $(LUA_LIBDIR)/$(LIBNAME) $(LUA_LIBDIR)/$T.so
 
 clean:
-	rm -f $L src/$(LIBNAME) $(OBJS)
+	rm -f src/lfs.so $(OBJS)
-
-dist: dist_dir
-	tar -czf $(TAR_FILE) $(DIST_DIR)
-	zip -rq $(ZIP_FILE) $(DIST_DIR)/*
-	rm -rf $(DIST_DIR)
-
-dist_dir:
-	mkdir -p $(DIST_DIR)
-	cp config $(SRCS) $T.h $T.def Makefile *html luafilesystem.png $(DIST_DIR)

Makefile.win

@@ -0,0 +1,25 @@
+# $Id: Makefile.win,v 1.11 2008/05/07 19:06:37 carregal Exp $
+
+T= lfs
+
+include config.win
+
+SRCS= src\$T.c
+OBJS= src\$T.obj
+
+lib: src\lfs.dll
+
+.c.obj:
+	$(CC) /c /Fo$@ $(CFLAGS) $<
+
+src\lfs.dll: $(OBJS)
+	link /dll /def:src\$T.def /out:src\lfs.dll $(OBJS) "$(LUA_LIB)"
+	IF EXIST src\lfs.dll.manifest mt -manifest src\lfs.dll.manifest -outputresource:src\lfs.dll;2
+
+install: src\lfs.dll
+	IF NOT EXIST "$(LUA_LIBDIR)" mkdir "$(LUA_LIBDIR)"
+	copy src\lfs.dll "$(LUA_LIBDIR)"
+
+clean:
+	del src\lfs.dll $(OBJS) src\$T.lib src\$T.exp
+	IF EXIST src\lfs.dll.manifest del src\lfs.dll.manifest

README

@@ -0,0 +1,74 @@
+LuaFileSystem - File System Library for Lua
+Copyright 2003 Kepler Project
+http://www.keplerproject.org/luafilesystem
+
+Description
+-----------
+LuaFileSystem is a Lua library developed to complement the set of functions
+related to file systems offered by the standard Lua distribution.
+
+LuaFileSystem offers a portable way to access the underlying directory structure and file attributes.
+LuaFileSystem is free software and uses the same license as Lua 5.1
+
+LuaRocks Installation
+---------------------
+luarocks install luafilesystem
+
+Unix Installation
+-----------------
+To install on Linux/OSX/BSD, please edit the config file and then call
+
+make
+make install
+
+The last step may require root privileges.
+
+Windows Installation
+--------------------
+To install on Windows, please copy lfs.dll to your package.cpath directory
+
+Documentation
+-------------
+Please check the documentation at /doc/us/ for more information.
+
+History
+-------
+
+Version 1.4.2 [03/Feb/2009]
+
+        * fixed bug [#13198] lfs.attributes(filename, 'size') overflow on files > 2 Gb again (bug report and patch by KUBO Takehiro).
+        * fixed bug [#39794] Compile error on Solaris 10 (bug report and patch by Aaron B).
+        * fixed compilation problems with Borland C.
+
+Version 1.4.1 [07/May/2008]
+
+        * documentation review
+        * fixed Windows compilation issues
+        * fixed bug in the Windows tests (patch by Shmuel Zeigerman)
+        * fixed bug [#2185] lfs.attributes(filename, 'size') overflow on files > 2 Gb
+
+Version 1.4.0 [13/Feb/2008]
+
+        * added function lfs.setmode (works only in Windows systems).
+        * lfs.attributes raises an error if attribute does not exist
+
+Version 1.3.0 [26/Oct/2007]
+
+        * added function lfs.symlinkattributes (works only in non Windows systems).
+
+Version 1.2.1 [08/May/2007]
+
+        * compatible only with Lua 5.1 (Lua 5.0 support was dropped)
+
+Version 1.2 [15/Mar/2006]
+
+        * added optional argument to lfs.attributes
+        * added function lfs.rmdir
+        * bug correction on lfs.dir
+
+Version 1.1 [30/May/2005]
+
+        * added function lfs.touch.
+
+Version 1.0 [21/Jan/2005]
+Version 1.0 Beta [10/Nov/2004]

config

@@ -1,22 +1,24 @@
 # Installation directories
+
+# Default installation prefix
+PREFIX=/usr/local
+
 # System's libraries directory (where binary libraries are installed)
-LUA_LIBDIR= /usr/local/lib/lua/5.0
+LUA_LIBDIR= $(PREFIX)/lib/lua/5.1
+
 # Lua includes directory
-LUA_INC= /usr/local/include/lua5
+LUA_INC= $(PREFIX)/include
 
 # OS dependent
-#LIB_OPTION= -bundle -undefined  dynamic_lookup #for MacOS X
 LIB_OPTION= -shared #for Linux
+#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
 
-COMPAT_DIR= ../compat/src
+LIBNAME= $T.so.$V
 
 # Compilation directives
-# On FreeBSD systems, the following line should be commented
+WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
-DLLIB= -ldl
+INCS= -I$(LUA_INC)
-#LUA_LIBS= -llua50 -lm
-WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings
-INCS= -I$(LUA_INC) -I$(COMPAT_DIR)
-LIBS= $(LUA_LIBS) $(DLLIB)
 CFLAGS= $(WARN) $(INCS)
 CC= gcc
 
+# $Id: config,v 1.21 2007/10/27 22:42:32 carregal Exp $

config.win

@@ -0,0 +1,19 @@
+# Installation directories
+# System's libraries directory (where binary libraries are installed)
+LUA_LIBDIR= "c:\lua5.1"
+
+# Lua includes directory
+LUA_INC= "c:\lua5.1\include"
+
+# Lua library
+LUA_LIB= "c:\lua5.1\lua5.1.lib"
+
+LIBNAME= $T.dll
+
+# Compilation directives
+WARN= /O2
+INCS= /I$(LUA_INC)
+CFLAGS= /MD $(WARN) $(INCS)
+CC= cl
+
+# $Id: config.win,v 1.7 2008/03/25 17:39:29 mascarenhas Exp $

doc/us/examples.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 	<title>LuaFileSystem</title>
     <link rel="stylesheet" href="http://www.keplerproject.org/doc.css" type="text/css"/>
@@ -12,9 +12,11 @@
 <div id="container">
 
 <div id="product">
-	<div id="product_logo"><a href="http://www.keplerproject.org">
+	<div id="product_logo">
+        <a href="http://www.keplerproject.org">
 		<img alt="LuaFileSystem" src="luafilesystem.png"/>
-	</a></div>
+	    </a>
+    </div>
 	<div id="product_name"><big><strong>LuaFileSystem</strong></big></div>
 	<div id="product_description">File System Library for the Lua Programming Language</div>
 </div> <!-- id="product" -->
@@ -37,11 +39,18 @@
 		<li><a href="manual.html">Manual</a>
 			<ul>
 				<li><a href="manual.html#introduction">Introduction</a></li>
+				<li><a href="manual.html#building">Building</a></li>
 				<li><a href="manual.html#installation">Installation</a></li>
 				<li><a href="manual.html#reference">Reference</a></li>
 			</ul>
 		</li>
 		<li><strong>Examples</strong></li>
+        <li><a href="http://luaforge.net/projects/luafilesystem/">Project</a>
+            <ul>
+                <li><a href="http://luaforge.net/tracker/?group_id=66">Bug Tracker</a></li>
+                <li><a href="http://luaforge.net/scm/?group_id=66">CVS</a></li>
+            </ul>
+        </li>
 		<li><a href="license.html">License</a></li>
 	</ul>
 </div> <!-- id="navigation" -->
@@ -84,10 +93,8 @@ attrdir (".")
 </div> <!-- id="main" -->
 
 <div id="about">
-	<p><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p>
+	<p><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a></p>
-	<p><small>
+	<p><small>$Id: examples.html,v 1.8 2007/12/14 15:28:04 carregal Exp $</small></p>
-	$Id: examples.html,v 1.3 2005/05/20 18:04:56 uid20002 Exp $
-	</small></p>
 </div> <!-- id="about" -->
 
 </div> <!-- id="container" -->

doc/us/index.html

@@ -1,19 +1,22 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 	<title>LuaFileSystem</title>
     <link rel="stylesheet" href="http://www.keplerproject.org/doc.css" type="text/css"/>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
+
 <body>
 
 <div id="container">
 
 <div id="product">
-	<div id="product_logo"><a href="http://www.keplerproject.org">
+	<div id="product_logo">
+        <a href="http://www.keplerproject.org">
 		<img alt="LuaFileSystem" src="luafilesystem.png"/>
-	</a></div>
+	    </a>
+    </div>
 	<div id="product_name"><big><strong>LuaFileSystem</strong></big></div>
 	<div id="product_description">File System Library for the Lua Programming Language</div>
 </div> <!-- id="product" -->
@@ -36,11 +39,18 @@
 		<li><a href="manual.html">Manual</a>
 			<ul>
 				<li><a href="manual.html#introduction">Introduction</a></li>
+				<li><a href="manual.html#building">Building</a></li>
 				<li><a href="manual.html#installation">Installation</a></li>
 				<li><a href="manual.html#reference">Reference</a></li>
 			</ul>
 		</li>
 		<li><a href="examples.html">Examples</a></li>
+        <li><a href="http://luaforge.net/projects/luafilesystem/">Project</a>
+            <ul>
+                <li><a href="http://luaforge.net/tracker/?group_id=66">Bug Tracker</a></li>
+                <li><a href="http://luaforge.net/scm/?group_id=66">CVS</a></li>
+            </ul>
+        </li>
 		<li><a href="license.html">License</a></li>
 	</ul>
 </div> <!-- id="navigation" -->
@@ -57,45 +67,103 @@ systems offered by the standard Lua distribution.</p>
 the underlying directory structure and file attributes.</p>
 
 <p>LuaFileSystem is free software and uses the same
-<a href="license.html">license</a> as Lua 5.0.</p>
+<a href="license.html">license</a> as Lua 5.1.</p>
 
 <h2><a name="status"></a>Status</h2>
 
-<p>Current version is 1.1. It was developed for Lua 5.0.</p>
+<p>Current version is 1.4.2. It was developed for Lua 5.1.</p>
-
-<p>Version 1.1 follows the
-<a href="http://www.keplerproject.org/compat">package model</a>
-for Lua 5.1 (see section <a href="manual.html#installation">Installation</a>
-for more details).</p>
-
 
 <h2><a name="download"></a>Download</h2>
 
-<p>LuaFileSystem can be downloaded in source  format from its
+<p>LuaFileSystem source can be downloaded from its
 <a href="http://luaforge.net/projects/luafilesystem/files">Lua Forge</a>
 page. If you are using
-<a href="http://luaforge.net/projects/luabinaries/">LuaBinaries</a> Release 2
+<a href="http://luabinaries.luaforge.net">LuaBinaries</a> a Windows binary
-a Windows pre-compiled version of LuaFileSystem can also be found at the same
+version of LuaFileSystem (compiled with Visual Studio 2005 Express) can be found at the same LuaForge page.</p>
-LuaForge page.</p>
-
 
 <h2><a name="history"></a>History</h2>
 
-<ul>
+<dl class="history">
-    <li>[30/May/2005] Version 1.1 released<br/>
+	<dt><strong>Version 1.4.2</strong> [03/Feb/2009]</dt>
-        added function <code>lfs.touch</code>.
+	<dd>
+		<ul>
+			<li>fixed bug [<a href="http://luaforge.net/tracker/?func=detail&amp;group_id=66&amp;aid=13198&amp;atid=356">#13198</a>]
+				lfs.attributes(filename, 'size') overflow on files > 2 Gb again  (bug report and patch by KUBO Takehiro).</li>
+			<li>fixed bug [<a href="http://luaforge.net/tracker/?group_id=66&amp;atid=356&amp;func=detail&amp;aid=39794">#39794</a>]
+				Compile error on Solaris 10 (bug report and patch by Aaron B).</li>
+			<li>fixed compilation problems with Borland C.</li>
+		</ul>
+	</dd>
+	
+    <dt><strong>Version 1.4.1</strong> [07/May/2008]</dt>
+	<dd>
+	<ul>
+	<li>documentation review</li>
+	<li>fixed Windows compilation issues</li>
+	<li>fixed bug in the Windows tests (patch by Shmuel Zeigerman)</li>
+	<li>fixed bug [<a href="http://luaforge.net/tracker/?func=detail&amp;group_id=66&amp;aid=2185&amp;atid=356">#2185</a>]
+		<code>lfs.attributes(filename, 'size')</code> overflow on files > 2 Gb
 	</li>
-    <li>[21/Jan/2005] Version 1.0 released</li>
+	</ul>
-    <li>[10/Nov/2004] Version 1.0 beta released</li>
+	</dd>
-</ul>
 	
+    <dt><strong>Version 1.4.0</strong> [13/Feb/2008]</dt>
+    <dd>
+    <ul>
+	<li>added function
+	<a href="manual.html#setmode"><code>lfs.setmode</code></a>
+        (works only in Windows systems).</li>
+	<li><a href="manual.html#attributes"><code>lfs.attributes</code></a>
+	raises an error if attribute does not exist</li>
+    </ul>
+    </dd>
     
+    <dt><strong><a href="http://www.keplerproject.org/luafilesystem/1.3/">Version 1.3.0</a></strong> [26/Oct/2007]</dt>
+    <dd>
+    <ul>
+        <li>added function
+        <a href="manual.html#symlinkattributes"><code>lfs.symlinkattributes</code></a>
+        (works only in non Windows systems).</li>
+    </ul>
+    </dd>
+
+    <dt><strong><a href="http://www.keplerproject.org/luafilesystem/1.2/">Version 1.2.1</a></strong> [08/May/2007]</dt>
+    <dd>
+    <ul>
+        <li>compatible only with Lua 5.1 (Lua 5.0 support was dropped)</li>
+    </ul>
+    </dd>
+
+    <dt><strong><a href="http://www.keplerproject.org/luafilesystem/1.2/">Version 1.2</a></strong> [15/Mar/2006]</dt>
+    <dd>
+    <ul>
+        <li>added optional argument to
+        <a href="manual.html#attributes"><code>lfs.attributes</code></a></li>
+        <li>added function
+        <a href="manual.html#rmdir"><code>lfs.rmdir</code></a></li>
+        <li>bug correction on <a href="manual.html#dir"><code>lfs.dir</code></a></li>
+    </ul>
+    </dd>
+
+    <dt><strong><a href="http://www.keplerproject.org/luafilesystem/1.1/">Version 1.1</a></strong> [30/May/2005]</dt>
+    <dd>
+    <ul>
+        <li>added function <a href="manual.html#touch"><code>lfs.touch</code></a>.</li>
+    </ul>
+    </dd>
+
+    <dt><strong><a href="http://www.keplerproject.org/luafilesystem/1.0/">Version 1.0</a></strong> [21/Jan/2005]</dt>
+    <dd />
+
+    <dt><strong>Version 1.0 Beta</strong> [10/Nov/2004]</dt>
+    <dd />
+</dl>
 
 <h2><a name="credits"></a>Credits</h2>
 
 <p>LuaFileSystem was designed by Roberto Ierusalimschy,
 Andr&eacute; Carregal and Tom&aacute;s Guisasola as part of the
-<a href="http://www.keplerproject.org">Kepler Project</a>
+<a href="http://www.keplerproject.org">Kepler Project</a>,
 which holds its copyright.</p>
 
 <h2><a name="contact"></a>Contact us</h2>
@@ -104,15 +172,16 @@ which holds its copyright.</p>
 <a href="mailto:info-NO-SPAM-THANKS@keplerproject.org">contact us</a>.
 Comments are welcome!</p>
 
+<p>You can also reach other Kepler developers and users on the Kepler Project
+<a href="http://luaforge.net/mail/?group_id=104">mailing list</a>.</p>
+
 </div> <!-- id="content" -->
 
 </div> <!-- id="main" -->
 
 <div id="about">
-	<p><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p>
+	<p><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a></p>
-	<p><small>
+	<p><small>$Id: index.html,v 1.43 2009/02/03 22:05:49 carregal Exp $</small></p>
-	$Id: index.html,v 1.22 2005/05/30 18:25:15 uid20002 Exp $
-	</small></p>
 </div> <!-- id="about" -->
 
 </div> <!-- id="container" -->

doc/us/license.html

@@ -1,19 +1,22 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 	<title>LuaFileSystem</title>
     <link rel="stylesheet" href="http://www.keplerproject.org/doc.css" type="text/css"/>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
+
 <body>
 
 <div id="container">
 
 <div id="product">
-	<div id="product_logo"><a href="http://www.keplerproject.org">
+	<div id="product_logo">
+        <a href="http://www.keplerproject.org">
 		<img alt="LuaFileSystem" src="luafilesystem.png"/>
-	</a></div>
+	    </a>
+    </div>
 	<div id="product_name"><big><strong>LuaFileSystem</strong></big></div>
 	<div id="product_description">File System Library for the Lua Programming Language</div>
 </div> <!-- id="product" -->
@@ -36,11 +39,18 @@
 		<li><a href="manual.html">Manual</a>
 			<ul>
 				<li><a href="manual.html#introduction">Introduction</a></li>
+				<li><a href="manual.html#building">Building</a></li>
 				<li><a href="manual.html#installation">Installation</a></li>
 				<li><a href="manual.html#reference">Reference</a></li>
 			</ul>
 		</li>
 		<li><a href="examples.html">Examples</a></li>
+        <li><a href="http://luaforge.net/projects/luafilesystem/">Project</a>
+            <ul>
+                <li><a href="http://luaforge.net/tracker/?group_id=66">Bug Tracker</a></li>
+                <li><a href="http://luaforge.net/scm/?group_id=66">CVS</a></li>
+            </ul>
+        </li>
 		<li><strong>License</strong></li>
 	</ul>
 </div> <!-- id="navigation" -->
@@ -75,7 +85,7 @@ Ierusalimschy, Andr&eacute; Carregal and Tom&aacute;s Guisasola.
 The implementation is not derived from licensed software.</p>
 
 <hr/>
-<p>Copyright &copy; 2004-2005 The Kepler Project.</p>
+<p>Copyright &copy; 2003 Kepler Project.</p>
 
 <p>Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@@ -102,10 +112,8 @@ SOFTWARE.</p>
 </div> <!-- id="main" -->
 
 <div id="about">
-	<p><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p>
+	<p><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a></p>
-	<p><small>
+	<p><small>$Id: license.html,v 1.13 2008/02/11 22:42:21 carregal Exp $</small></p>
-	$Id: license.html,v 1.7 2005/05/20 18:43:00 uid20006 Exp $
-	</small></p>
 </div><!-- id="about" -->
 
 </div><!-- id="container" -->

doc/us/manual.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 	<title>LuaFileSystem</title>
     <link rel="stylesheet" href="http://www.keplerproject.org/doc.css" type="text/css"/>
@@ -12,9 +12,9 @@
 <div id="container">
 
 <div id="product">
-	<div id="product_logo"><a href="http://www.keplerproject.org">
+	<div id="product_logo">
-		<img alt="LuaFileSystem" src="luafilesystem.png"/>
+        <a href="http://www.keplerproject.org"><img alt="LuaFileSystem" src="luafilesystem.png"/></a>
-	</a></div>
+    </div>
 	<div id="product_name"><big><strong>LuaFileSystem</strong></big></div>
 	<div id="product_description">File System Library for the Lua Programming Language</div>
 </div> <!-- id="product" -->
@@ -37,11 +37,18 @@
 		<li><strong>Manual</strong>
 			<ul>
 				<li><a href="manual.html#introduction">Introduction</a></li>
+				<li><a href="manual.html#building">Building</a></li>
 				<li><a href="manual.html#installation">Installation</a></li>
 				<li><a href="manual.html#reference">Reference</a></li>
 			</ul>
 		</li>
 		<li><a href="examples.html">Examples</a></li>
+        <li><a href="http://luaforge.net/projects/luafilesystem/">Project</a>
+            <ul>
+                <li><a href="http://luaforge.net/tracker/?group_id=66">Bug Tracker</a></li>
+                <li><a href="http://luaforge.net/scm/?group_id=66">CVS</a></li>
+            </ul>
+        </li>
 		<li><a href="license.html">License</a></li>
 	</ul>
 </div> <!-- id="navigation" -->
@@ -57,39 +64,62 @@ systems offered by the standard Lua distribution.</p>
 <p>LuaFileSystem offers a portable way to access
 the underlying directory structure and file attributes.</p>
 
-<p>LuaFileSystem source is distributed as a pair of C source and header
+<h2><a name="building"></a>Building</h2>
-files. The distribution provides a <code>Makefile</code> prepared to
+
-compile the library and install it. The file <code>config</code> should
+<p>
-be edited to suit the needs of the aimed platform.</p>
+LuaFileSystem should be built with Lua 5.1 so the language library
+and header files for the target version must be installed properly.
+</p>
+
+<p>
+LuaFileSystem offers a Makefile and a separate configuration file,
+<code>config</code>,
+which should be edited to suit your installation before running
+<code>make</code>.
+The file has some definitions like paths to the external libraries,
+compiler options and the like.
+</p>
+
+<p>On Windows, the C runtime used to compile LuaFileSystem must be the same
+runtime that Lua uses, or some LuaFileSystem functions will not work.</p>
 
 <h2><a name="installation"></a>Installation</h2>
 
-<p>LuaFileSystem follows the
+<p>The easiest way to install LuaFileSystem is to use LuaRocks:</p>
-<a href="http://www.keplerproject.org/compat">package model</a>
-for Lua 5.1, therefore it should be "installed". Refer to
-<a href="http://www.keplerproject.org/compat/manual.html#configuration">
-Compat-5.1 configuration</a> section about how to install the compiled
-binary properly</p>
 
-<p>Windows users can use the pre-compiled version of LuaFileSystem
+<pre class="example">
-(<code>lfs.dll</code>) available at
+luarocks install luafilesystem
-<a href="http://luaforge.net/projects/luafilesystem/files">LuaForge</a></p>
+</pre>
+
+<p>If you prefer to install LuaFileSystem manually, the compiled binary should be copied to a directory in your
+<a href="http://www.lua.org/manual/5.1/manual.html#pdf-package.cpath">C path</a>.</p>
 
 <h2><a name="reference"></a>Reference</h2>
 
-<p>LuaFileSystem offers the following functions:</p>
+<p>
+LuaFileSystem offers the following functions:
+</p>
 
 <dl class="reference">
-    <dt><a name="attributes"></a><strong><code>lfs.attributes (filepath)</code></strong></dt>
+    <dt><a name="attributes"></a><strong><code>lfs.attributes (filepath [, aname])</code></strong></dt>
-    <dd>Returns a table with the file attributes corresponding to <code>filepath</code>.
+    <dd>Returns a table with the file attributes corresponding to
-    The attributes are: 
+    <code>filepath</code> (or <code>nil</code> followed by an error message
+    in case of error).
+    If the second optional argument is given, then only the value of the
+    named attribute is returned (this use is equivalent to
+    <code>lfs.attributes(filepath).aname</code>, but the table is not created
+    and only one attribute is retrieved from the O.S.).
+    The attributes are described as follows;
+    attribute <code>mode</code> is a string, all the others are numbers,
+    and the time related attributes use the same time reference of
+    <a href="http://www.lua.org/manual/5.1/manual.html#pdf-os.time"><code>os.time</code></a>: 
         <dl>
         <dt><strong><code>dev</code></strong></dt>
-        <dd>on Unix systems, represents the device that the inode resides on. On Windows systems,
+        <dd>on Unix systems, this represents the device that the inode resides on. On Windows systems,
         represents the drive number of the disk containing the file</dd>
         
         <dt><strong><code>ino</code></strong></dt>
-        <dd>on Unix systems, represents the inode number. On Windows systems this has no meaning</dd>
+        <dd>on Unix systems, this represents the inode number. On Windows systems this has no meaning</dd>
         
         <dt><strong><code>mode</code></strong></dt>
         <dd>string representing the associated protection mode (the values could be
@@ -107,7 +137,7 @@ binary properly</p>
 		<dd>group-id of owner (Unix only, always 0 on Windows)</dd>
 
         <dt><strong><code>rdev</code></strong></dt>
-		<dd>on Unix systems, represents the device type, for special file inode.
+		<dd>on Unix systems, represents the device type, for special file inodes.
         On Windows systems represents the same as <code>dev</code></dd>
 
         <dt><strong><code>access</code></strong></dt>
@@ -128,6 +158,12 @@ binary properly</p>
         <dt><strong><code>blksize</code></strong></dt>
 		<dd>optimal file system I/O blocksize; (Unix only)</dd>
 	    </dl>
+    This function uses <code>stat</code> internally thus if the given
+    <code>filepath</code> is a symbolic link, it is followed (if it points to
+    another link the chain is followed recursively) and the information
+    is about the file it refers to.
+    To obtain information about the link itself, see function
+    <a href="#symlinkattributes">lfs.symlinkattributes</a>.
 	</dd>
 
     <dt><a name="chdir"></a><strong><code>lfs.chdir (path)</code></strong></dt>
@@ -141,8 +177,12 @@ binary properly</p>
     plus an error string.</dd>
     
     <dt><a name="dir"></a><strong><code>lfs.dir (path)</code></strong></dt>
-    <dd>Lua iterator over the entries of a given directory. Raises an
+    <dd>
-    error if <code>path</code> is not a directory.</dd>
+    Lua iterator over the entries of a given directory.
+    Each time the iterator is called it returns a directory entry's name as a string, or
+    <code>nil</code> if there are no more entries.
+    Raises an error if <code>path</code> is not a directory.
+    </dd>
     
     <dt><a name="lock"></a><strong><code>lfs.lock (filehandle, mode[, start[, length]])</code></strong></dt>
     <dd>Locks a file or a part of it. This function works on <em>open files</em>; the
@@ -152,15 +192,34 @@ binary properly</p>
     write/exclusive lock). The optional arguments <code>start</code>
     and <code>length</code> can be used to specify a starting point and
     its length; both should be numbers.<br />
-    Returns a boolean indicating if the operation was successful; in
+    Returns <code>true</code> if the operation was successful; in
-    case of error, it returns <code>false</code> plus an error string.
+    case of error, it returns <code>nil</code> plus an error string.
     </dd>
     
     <dt><a name="mkdir"></a><strong><code>lfs.mkdir (dirname)</code></strong></dt>
     <dd>Creates a new directory. The argument is the name of the new
     directory.<br />
-    Returns a boolean indicating whether the operation succeeds or not
+    Returns <code>true</code> if the operation was successful;
-    (in this case, an error string is returned too).</dd>
+    in case of error, it returns <code>nil</code> plus an error string.
+    </dd>
+    
+    <dt><a name="rmdir"></a><strong><code>lfs.rmdir (dirname)</code></strong></dt>
+    <dd>Removes an existing directory. The argument is the name of the directory.<br />
+    Returns <code>true</code> if the operation was successful;
+    in case of error, it returns <code>nil</code> plus an error string.</dd>
+
+    <dt><a name="setmode"></a><strong><code>lfs.setmode (file, mode)</code></strong></dt>
+    <dd>Sets the writing mode for a file. The mode string can be either <code>binary</code> or <code>text</code>.
+    Returns the previous mode string for the file. This function is only available in Windows, so you may want to make sure that
+    <code>lfs.setmode</code> exists before using it.
+    </dd>
+    
+    <dt><a name="symlinkattributes"></a><strong><code>lfs.symlinkattributes (filepath [, aname])</code></strong></dt>
+    <dd>Identical to <a href="#attributes">lfs.attributes</a> except that
+    it obtains information about the link itself (not the file it refers to).
+    This function is not available in Windows so you may want to make sure that
+    <code>lfs.symlinkattributes</code> exists before using it.
+    </dd>
 
     <dt><a name="touch"></a><strong><code>lfs.touch (filepath [, atime [, mtime]])</code></strong></dt>
     <dd>Set access and modification times of a file. This function is
@@ -168,11 +227,12 @@ binary properly</p>
     filename, the second argument (<code>atime</code>) is the access time,
     and the third argument (<code>mtime</code>) is the modification time.
     Both times are provided in seconds (which should be generated with
-    Lua standard function <code>os.date</code>).
+    Lua standard function <code>os.time</code>).
-    If the modifition time is omitted, the access time provided is used;
+    If the modification time is omitted, the access time provided is used;
     if both times are omitted, the current time is used.<br />
-    Returns a boolean indicating whether the operation succeeded or not
+    Returns <code>true</code> if the operation was successful;
-    (followed by an error string when it fails).</dd>
+    in case of error, it returns <code>nil</code> plus an error string.
+    </dd>
     
     <dt><a name="unlock"></a><strong><code>lfs.unlock (filehandle[, start[, length]])</code></strong></dt>
     <dd>Unlocks a file or a part of it. This function works on
@@ -180,9 +240,9 @@ binary properly</p>
     argument. The optional arguments <code>start</code> and
     <code>length</code> can be used to specify a starting point and its
     length; both should be numbers.<br />
-    Returns a boolean indicating if the operation was successful; in
+    Returns <code>true</code> if the operation was successful;
-    case of error, it returns <code>false</code> plus a string
+    in case of error, it returns <code>nil</code> plus an error string.
-    describing the error.</dd>
+    </dd>
 </dl>
 
 </div> <!-- id="content" -->
@@ -190,10 +250,8 @@ binary properly</p>
 </div> <!-- id="main" -->
 
 <div id="about">
-	<p><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p>
+	<p><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a></p>
-	<p><small>
+	<p><small>$Id: manual.html,v 1.43 2008/05/08 18:45:15 carregal Exp $</small></p>
-	$Id: manual.html,v 1.21 2005/05/24 23:27:34 carregal Exp $
-	</small></p>
 </div> <!-- id="about" -->
 
 </div> <!-- id="container" -->

rockspecs/luafilesystem-1.3.0-1.rockspec

@@ -0,0 +1,27 @@
+package = "LuaFileSystem"
+version = "1.3.0-1"
+source = {
+   url = "http://luaforge.net/frs/download.php/2679/luafilesystem-1.3.0.tar.gz"
+}
+description = {
+   summary = "File System Library for the Lua Programming Language",
+   detailed = [[
+      LuaFileSystem is a Lua library developed to complement the set of
+      functions related to file systems offered by the standard Lua
+      distribution. LuaFileSystem offers a portable way to access the
+      underlying directory structure and file attributes.
+   ]]
+}
+dependencies = {
+   "lua >= 5.1"
+}
+build = {
+   type = "make",
+   build_variables = {
+      LUA_INC = "$(LUA_INCDIR)",
+      LIB_OPTION = "$(LIBFLAG)"
+   },
+   install_variables = {
+      LUA_LIBDIR = "$(LIBDIR)"
+   }
+}

rockspecs/luafilesystem-1.4.0-1.rockspec

@@ -0,0 +1,27 @@
+package = "LuaFileSystem"
+version = "1.4.0-1"
+source = {
+   url = "http://luaforge.net/frs/download.php/3158/luafilesystem-1.4.0.tar.gz"
+}
+description = {
+   summary = "File System Library for the Lua Programming Language",
+   detailed = [[
+      LuaFileSystem is a Lua library developed to complement the set of
+      functions related to file systems offered by the standard Lua
+      distribution. LuaFileSystem offers a portable way to access the
+      underlying directory structure and file attributes.
+   ]]
+}
+dependencies = {
+   "lua >= 5.1"
+}
+build = {
+   type = "make",
+   build_variables = {
+      LUA_INC = "$(LUA_INCDIR)",
+      LIB_OPTION = "$(LIBFLAG)"
+   },
+   install_variables = {
+      LUA_LIBDIR = "$(LIBDIR)"
+   }
+}

rockspecs/luafilesystem-1.4.0-2.rockspec

@@ -0,0 +1,43 @@
+package = "LuaFileSystem"
+version = "1.4.0-2"
+source = {
+   url = "http://luaforge.net/frs/download.php/3158/luafilesystem-1.4.0.tar.gz"
+}
+description = {
+   summary = "File System Library for the Lua Programming Language",
+   detailed = [[
+      LuaFileSystem is a Lua library developed to complement the set of
+      functions related to file systems offered by the standard Lua
+      distribution. LuaFileSystem offers a portable way to access the
+      underlying directory structure and file attributes.
+   ]]
+}
+dependencies = {
+   "lua >= 5.1"
+}
+build = {
+   platforms = {
+     unix = {
+        type = "make",
+       	build_variables = {
+         LIB_OPTION = "$(LIBFLAG)",
+         CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)"
+       	}
+     },
+     win32 = {
+        type = "make",
+       	build_variables = {
+         LUA_LIB = "$(LUA_LIBDIR)\\lua5.1.lib",
+         CFLAGS = "/MD $(CFLAGS) /I$(LUA_INCDIR)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)",
+         LUA_DIR = "$(LUADIR)",
+	 	 BIN_DIR = "$(BINDIR)"
+       	}
+     }
+  }
+}

rockspecs/luafilesystem-1.4.1-1.rockspec

@@ -0,0 +1,43 @@
+package = "LuaFileSystem"
+version = "1.4.1-1"
+source = {
+   url = "http://luaforge.net/frs/download.php/3345/luafilesystem-1.4.1.tar.gz",
+}
+description = {
+   summary = "File System Library for the Lua Programming Language",
+   detailed = [[
+      LuaFileSystem is a Lua library developed to complement the set of
+      functions related to file systems offered by the standard Lua
+      distribution. LuaFileSystem offers a portable way to access the
+      underlying directory structure and file attributes.
+   ]]
+}
+dependencies = {
+   "lua >= 5.1"
+}
+build = {
+   platforms = {
+     unix = {
+        type = "make",
+       	build_variables = {
+         LIB_OPTION = "$(LIBFLAG)",
+         CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR) $(STAT64)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)"
+       	}
+     },
+     win32 = {
+        type = "make",
+       	build_variables = {
+         LUA_LIB = "$(LUA_LIBDIR)\\lua5.1.lib",
+         CFLAGS = "/MD $(CFLAGS) /I$(LUA_INCDIR)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)",
+         LUA_DIR = "$(LUADIR)",
+	 	 BIN_DIR = "$(BINDIR)"
+       	}
+     }
+  }
+}

rockspecs/luafilesystem-1.4.1rc1-1.rockspec

@@ -0,0 +1,43 @@
+package = "LuaFileSystem"
+version = "1.4.1rc1-1"
+source = {
+   url = "http://luafilesystem.luaforge.net/luafilesystem-1.4.1rc1.tar.gz",
+}
+description = {
+   summary = "File System Library for the Lua Programming Language",
+   detailed = [[
+      LuaFileSystem is a Lua library developed to complement the set of
+      functions related to file systems offered by the standard Lua
+      distribution. LuaFileSystem offers a portable way to access the
+      underlying directory structure and file attributes.
+   ]]
+}
+dependencies = {
+   "lua >= 5.1"
+}
+build = {
+   platforms = {
+     unix = {
+        type = "make",
+       	build_variables = {
+         LIB_OPTION = "$(LIBFLAG)",
+         CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR) $(STAT64)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)"
+       	}
+     },
+     win32 = {
+        type = "make",
+       	build_variables = {
+         LUA_LIB = "$(LUA_LIBDIR)\\lua5.1.lib",
+         CFLAGS = "/MD $(CFLAGS) /I$(LUA_INCDIR)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)",
+         LUA_DIR = "$(LUADIR)",
+	 	 BIN_DIR = "$(BINDIR)"
+       	}
+     }
+  }
+}

rockspecs/luafilesystem-1.4.2-1.rockspec

@@ -0,0 +1,26 @@
+package = "LuaFileSystem"
+
+version = "1.4.2-1"
+
+source = {
+   url = "http://luaforge.net/frs/download.php/3345/luafilesystem-1.4.1.tar.gz",
+}
+
+description = {
+   summary = "File System Library for the Lua Programming Language",
+   detailed = [[
+      LuaFileSystem is a Lua library developed to complement the set of
+      functions related to file systems offered by the standard Lua
+      distribution. LuaFileSystem offers a portable way to access the
+      underlying directory structure and file attributes.
+   ]]
+}
+
+dependencies = {
+   "lua >= 5.1"
+}
+
+build = {
+   type = "module",
+   modules = { lfs = "src/lfs.c" }
+}

rockspecs/luafilesystem-cvs-1.rockspec

@@ -0,0 +1,44 @@
+package = "LuaFileSystem"
+version = "cvs-1"
+source = {
+   url = "cvs://:pserver:anonymous:@cvs.luaforge.net:/cvsroot/luafilesystem",
+   cvs_tag = "HEAD"
+}
+description = {
+   summary = "File System Library for the Lua Programming Language",
+   detailed = [[
+      LuaFileSystem is a Lua library developed to complement the set of
+      functions related to file systems offered by the standard Lua
+      distribution. LuaFileSystem offers a portable way to access the
+      underlying directory structure and file attributes.
+   ]]
+}
+dependencies = {
+   "lua >= 5.1"
+}
+build = {
+   platforms = {
+     unix = {
+        type = "make",
+       	build_variables = {
+         LIB_OPTION = "$(LIBFLAG)",
+         CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)"
+       	}
+     },
+     win32 = {
+        type = "make",
+       	build_variables = {
+         LUA_LIB = "$(LUA_LIBDIR)\\lua5.1.lib",
+         CFLAGS = "$(CFLAGS) /I$(LUA_INCDIR)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)",
+         LUA_DIR = "$(LUADIR)",
+	 BIN_DIR = "$(BINDIR)"
+       	}
+     }
+  }
+}

rockspecs/luafilesystem-cvs-2.rockspec

@@ -0,0 +1,27 @@
+package = "LuaFileSystem"
+
+version = "cvs-2"
+
+source = {
+   url = "cvs://:pserver:anonymous:@cvs.luaforge.net:/cvsroot/luafilesystem",
+   cvs_tag = "HEAD"
+}
+
+description = {
+   summary = "File System Library for the Lua Programming Language",
+   detailed = [[
+      LuaFileSystem is a Lua library developed to complement the set of
+      functions related to file systems offered by the standard Lua
+      distribution. LuaFileSystem offers a portable way to access the
+      underlying directory structure and file attributes.
+   ]]
+}
+
+dependencies = {
+   "lua >= 5.1"
+}
+
+build = {
+   type = "module",
+   modules = { lfs = "src/lfs.c" }
+}

src/lfs.c

@@ -1,4 +1,7 @@
 /*
+** LuaFileSystem
+** Copyright Kepler Project 2003 (http://www.keplerproject.org/luafilesystem)
+**
 ** File system manipulation library.
 ** This library offers these functions:
 **   lfs.attributes (filepath [, attributename])
@@ -7,15 +10,29 @@
 **   lfs.dir (path)
 **   lfs.lock (fh, mode)
 **   lfs.mkdir (path)
+**   lfs.rmdir (path)
+**   lfs.setmode (filepath, mode)
+**   lfs.symlinkattributes (filepath [, attributename]) -- thanks to Sam Roberts
 **   lfs.touch (filepath [, atime [, mtime]])
 **   lfs.unlock (fh)
 **
-** $Id: lfs.c,v 1.21 2005/05/20 18:32:19 uid20006 Exp $
+** $Id: lfs.c,v 1.56 2009/02/03 22:05:48 carregal Exp $
 */
 
+#ifndef _WIN32
+#ifndef _AIX
+#define _FILE_OFFSET_BITS 64 /* Linux, Solaris and HP-UX */
+#else
+#define _LARGE_FILES 1 /* AIX */
+#endif
+#endif
+
+#define _LARGEFILE64_SOURCE
+
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include <time.h>
 #include <sys/stat.h>
 
@@ -23,7 +40,12 @@
 #include <direct.h>
 #include <io.h>
 #include <sys/locking.h>
-#include <sys/utime.h>
+#ifdef __BORLANDC__
+ #include <utime.h>
+#else
+ #include <sys/utime.h>
+#endif
+#include <fcntl.h>
 #else
 #include <unistd.h>
 #include <dirent.h>
@@ -35,8 +57,6 @@
 #include "lua.h"
 #include "lauxlib.h"
 #include "lualib.h"
-#include "compat-5.1.h"
-
 #include "lfs.h"
 
 /* Define 'strerror' for systems that do not implement it */
@@ -54,14 +74,36 @@
 
 #define DIR_METATABLE "directory metatable"
 #define MAX_DIR_LENGTH 1023
-#ifdef _WIN32
 typedef struct dir_data {
+	int  closed;
+#ifdef _WIN32
 	long hFile;
 	char pattern[MAX_DIR_LENGTH+1];
-} dir_data;
+#else
+	DIR *dir;
 #endif
+} dir_data;
 
 
+#ifdef _WIN32
+ #ifdef __BORLANDC__
+  #define lfs_setmode(L,file,m)   ((void)L, setmode(_fileno(file), m))
+  #define STAT_STRUCT struct stati64
+ #else
+  #define lfs_setmode(L,file,m)   ((void)L, _setmode(_fileno(file), m))
+  #define STAT_STRUCT struct _stati64
+ #endif
+#define STAT_FUNC _stati64
+#else
+#define _O_TEXT               0
+#define _O_BINARY             0
+#define lfs_setmode(L,file,m)   ((void)((void)file,m),  \
+		 luaL_error(L, LUA_QL("setmode") " not supported on this platform"), -1)
+#define STAT_STRUCT struct stat
+#define STAT_FUNC stat
+#define LSTAT_FUNC lstat
+#endif
+
 /*
 ** This function changes the working (current) directory
 */
@@ -84,14 +126,15 @@ static int change_dir (lua_State *L) {
 **  and a string describing the error
 */
 static int get_dir (lua_State *L) {
-	char path[255+2];
+  char *path;
-	if (getcwd(path, 255) == NULL) {
+  if ((path = getcwd(NULL, 0)) == NULL) {
     lua_pushnil(L);
     lua_pushstring(L, getcwd_error);
     return 2;
   }
   else {
     lua_pushstring(L, path);
+    free(path);
     return 1;
   }
 }
@@ -141,7 +184,11 @@ static int _file_lock (lua_State *L, FILE *fh, const char *mode, const long star
 		len = ftell (fh);
 	}
 	fseek (fh, start, SEEK_SET);
+#ifdef __BORLANDC__
+	code = locking (fileno(fh), lkmode, len);
+#else
 	code = _locking (fileno(fh), lkmode, len);
+#endif
 #else
 	struct flock f;
 	switch (*mode) {
@@ -158,6 +205,43 @@ static int _file_lock (lua_State *L, FILE *fh, const char *mode, const long star
 	return (code != -1);
 }
 
+#ifdef _WIN32
+static int lfs_g_setmode (lua_State *L, FILE *f, int arg) {
+  static const int mode[] = {_O_TEXT, _O_BINARY};
+  static const char *const modenames[] = {"text", "binary", NULL};
+  int op = luaL_checkoption(L, arg, NULL, modenames);
+  int res = lfs_setmode(L, f, mode[op]);
+  if (res != -1) {
+    int i;
+    lua_pushboolean(L, 1);
+    for (i = 0; modenames[i] != NULL; i++) {
+      if (mode[i] == res) {
+        lua_pushstring(L, modenames[i]);
+        goto exit;
+      }
+    }
+    lua_pushnil(L);
+  exit:
+    return 2;
+  } else {
+    int en = errno;
+    lua_pushnil(L);
+    lua_pushfstring(L, "%s", strerror(en));
+    lua_pushinteger(L, en);
+    return 3;
+  }
+}
+#else
+static int lfs_g_setmode (lua_State *L, FILE *f, int arg) {
+  lua_pushboolean(L, 0);
+  lua_pushliteral(L, "setmode not supported on this platform");
+  return 2;
+}
+#endif
+
+static int lfs_f_setmode(lua_State *L) {
+  return lfs_g_setmode(L, check_file(L, 1, "setmode"), 2);
+}
 
 /*
 ** Locks a file.
@@ -175,7 +259,7 @@ static int file_lock (lua_State *L) {
 		lua_pushboolean (L, 1);
 		return 1;
 	} else {
-		lua_pushboolean (L, 0);
+		lua_pushnil (L);
 		lua_pushfstring (L, "%s", strerror(errno));
 		return 2;
 	}
@@ -196,40 +280,13 @@ static int file_unlock (lua_State *L) {
 		lua_pushboolean (L, 1);
 		return 1;
 	} else {
-		lua_pushboolean (L, 0);
+		lua_pushnil (L);
 		lua_pushfstring (L, "%s", strerror(errno));
 		return 2;
 	}
 }
 
 
-/*
-static void cgilua_sleep( lua_State *L )
-{
-  unsigned int usec = (unsigned int)luaL_check_number( L, 1 );
-
-#ifndef _WIN32
-  sleep( (unsigned int)ceil( usec/1000.0 ));
-#else
-  Sleep( (DWORD)usec );
-#endif
-}
-
-static void cgilua_filesize( lua_State *L )
-{
-  struct stat info;
-  char *file = luaL_check_string( L, 1 );
-
-  if (stat(file, &info))
-  {
-    lua_pushnil( L );
-    lua_pushstring( L, "Cannot retrieve stat info from file" );
-    return;
-  }
-  lua_pushnumber(L, info.st_size);
-}
-*/
-
 static int make_dir (lua_State *L) {
 	const char *path = luaL_checkstring (L, 1);
 	int fail;
@@ -241,23 +298,47 @@ static int make_dir (lua_State *L) {
 	fail =  mkdir (path, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP |
 	                     S_IWGRP | S_IXGRP | S_IROTH | S_IXOTH );
 #endif
-	lua_pushboolean (L, !fail);
 	if (fail) {
+		lua_pushnil (L);
         lua_pushfstring (L, "%s", strerror(errno));
 		return 2;
 	}
 	umask (oldmask);
+	lua_pushboolean (L, 1);
 	return 1;
 }
 
+/*
+** Removes a directory.
+** @param #1 Directory path.
+*/
+static int remove_dir (lua_State *L) {
+	const char *path = luaL_checkstring (L, 1);
+	int fail;
+
+	fail = rmdir (path);
+
+	if (fail) {
+		lua_pushnil (L);
+		lua_pushfstring (L, "%s", strerror(errno));
+		return 2;
+	}
+	lua_pushboolean (L, 1);
+	return 1;
+}
 
 /*
 ** Directory iterator
 */
 static int dir_iter (lua_State *L) {
 #ifdef _WIN32
-	dir_data *d = (dir_data *)lua_touserdata (L, lua_upvalueindex (1));
 	struct _finddata_t c_file;
+#else
+	struct dirent *entry;
+#endif
+	dir_data *d = (dir_data *)lua_touserdata (L, lua_upvalueindex (1));
+	luaL_argcheck (L, !d->closed, 1, "closed directory");
+#ifdef _WIN32
 	if (d->hFile == 0L) { /* first entry */
 		if ((d->hFile = _findfirst (d->pattern, &c_file)) == -1L) {
 			lua_pushnil (L);
@@ -268,22 +349,26 @@ static int dir_iter (lua_State *L) {
 			return 1;
 		}
 	} else { /* next entry */
-		if (_findnext (d->hFile, &c_file) == -1L)
+		if (_findnext (d->hFile, &c_file) == -1L) {
+			/* no more entries => close directory */
+			_findclose (d->hFile);
+			d->closed = 1;
 			return 0;
-		else {
+		} else {
 			lua_pushstring (L, c_file.name);
 			return 1;
 		}
 	}
 #else
-	DIR *d = *(DIR **) lua_touserdata (L, lua_upvalueindex (1));
+	if ((entry = readdir (d->dir)) != NULL) {
-	struct dirent *entry;
-	if ((entry = readdir (d)) != NULL) {
 		lua_pushstring (L, entry->d_name);
 		return 1;
-	}
+	} else {
-	else
+		/* no more entries => close directory */
+		closedir (d->dir);
+		d->closed = 1;
 		return 0;
+	}
 #endif
 }
 
@@ -292,15 +377,17 @@ static int dir_iter (lua_State *L) {
 ** Closes directory iterators
 */
 static int dir_close (lua_State *L) {
-#ifdef _WIN32
 	dir_data *d = (dir_data *)lua_touserdata (L, 1);
-	if (d->hFile) {
+#ifdef _WIN32
+	if (!d->closed && d->hFile) {
 		_findclose (d->hFile);
+		d->closed = 1;
 	}
 #else
-	DIR *d = *(DIR **)lua_touserdata (L, 1);
+	if (!d->closed && d->dir) {
-	if (d)
+		closedir (d->dir);
-		closedir (d);
+		d->closed = 1;
+	}
 #endif
 	return 0;
 }
@@ -311,21 +398,21 @@ static int dir_close (lua_State *L) {
 */
 static int dir_iter_factory (lua_State *L) {
 	const char *path = luaL_checkstring (L, 1);
+	dir_data *d = (dir_data *) lua_newuserdata (L, sizeof(dir_data));
+	d->closed = 0;
 #ifdef _WIN32
-	dir_data *dir = (dir_data *) lua_newuserdata (L, sizeof(dir_data));
+	d->hFile = 0L;
-	dir->hFile = 0L;
+	luaL_getmetatable (L, DIR_METATABLE);
+	lua_setmetatable (L, -2);
 	if (strlen(path) > MAX_DIR_LENGTH)
 		luaL_error (L, "path too long: %s", path);
 	else
-		sprintf (dir->pattern, "%s/*", path);
+		sprintf (d->pattern, "%s/*", path);
-	luaL_getmetatable (L, DIR_METATABLE);
-	lua_setmetatable (L, -2);
 #else
-	DIR **d = (DIR **) lua_newuserdata (L, sizeof(DIR *));
 	luaL_getmetatable (L, DIR_METATABLE);
 	lua_setmetatable (L, -2);
-	*d = opendir (path);
+	d->dir = opendir (path);
-	if (*d == NULL)
+	if (d->dir == NULL)
 		luaL_error (L, "cannot open %s: %s", path, strerror (errno));
 #endif
 	lua_pushcclosure (L, dir_iter, 1);
@@ -421,93 +508,170 @@ static int file_utime (lua_State *L) {
 }
 
 
+/* inode protection mode */
+static void push_st_mode (lua_State *L, STAT_STRUCT *info) {
+	lua_pushstring (L, mode2string (info->st_mode));
+}
+/* device inode resides on */
+static void push_st_dev (lua_State *L, STAT_STRUCT *info) {
+	lua_pushnumber (L, (lua_Number)info->st_dev);
+}
+/* inode's number */
+static void push_st_ino (lua_State *L, STAT_STRUCT *info) {
+	lua_pushnumber (L, (lua_Number)info->st_ino);
+}
+/* number of hard links to the file */
+static void push_st_nlink (lua_State *L, STAT_STRUCT *info) {
+	lua_pushnumber (L, (lua_Number)info->st_nlink);
+}
+/* user-id of owner */
+static void push_st_uid (lua_State *L, STAT_STRUCT *info) {
+	lua_pushnumber (L, (lua_Number)info->st_uid);
+}
+/* group-id of owner */
+static void push_st_gid (lua_State *L, STAT_STRUCT *info) {
+	lua_pushnumber (L, (lua_Number)info->st_gid);
+}
+/* device type, for special file inode */
+static void push_st_rdev (lua_State *L, STAT_STRUCT *info) {
+	lua_pushnumber (L, (lua_Number)info->st_rdev);
+}
+/* time of last access */
+static void push_st_atime (lua_State *L, STAT_STRUCT *info) {
+	lua_pushnumber (L, info->st_atime);
+}
+/* time of last data modification */
+static void push_st_mtime (lua_State *L, STAT_STRUCT *info) {
+	lua_pushnumber (L, info->st_mtime);
+}
+/* time of last file status change */
+static void push_st_ctime (lua_State *L, STAT_STRUCT *info) {
+	lua_pushnumber (L, info->st_ctime);
+}
+/* file size, in bytes */
+static void push_st_size (lua_State *L, STAT_STRUCT *info) {
+	lua_pushnumber (L, (lua_Number)info->st_size);
+}
+#ifndef _WIN32
+/* blocks allocated for file */
+static void push_st_blocks (lua_State *L, STAT_STRUCT *info) {
+	lua_pushnumber (L, (lua_Number)info->st_blocks);
+}
+/* optimal file system I/O blocksize */
+static void push_st_blksize (lua_State *L, STAT_STRUCT *info) {
+	lua_pushnumber (L, (lua_Number)info->st_blksize);
+}
+#endif
+static void push_invalid (lua_State *L, STAT_STRUCT *info) {
+  luaL_error(L, "invalid attribute name");
+#ifndef _WIN32
+  info->st_blksize = 0; /* never reached */
+#endif
+}
+
+typedef void (*_push_function) (lua_State *L, STAT_STRUCT *info);
+
+struct _stat_members {
+	const char *name;
+	_push_function push;
+};
+
+struct _stat_members members[] = {
+	{ "mode",         push_st_mode },
+	{ "dev",          push_st_dev },
+	{ "ino",          push_st_ino },
+	{ "nlink",        push_st_nlink },
+	{ "uid",          push_st_uid },
+	{ "gid",          push_st_gid },
+	{ "rdev",         push_st_rdev },
+	{ "access",       push_st_atime },
+	{ "modification", push_st_mtime },
+	{ "change",       push_st_ctime },
+	{ "size",         push_st_size },
+#ifndef _WIN32
+	{ "blocks",       push_st_blocks },
+	{ "blksize",      push_st_blksize },
+#endif
+	{ NULL, push_invalid }
+};
+
 /*
-** Get file information
+** Get file or symbolic link information
 */
-static int file_info (lua_State *L) {
+static int _file_info_ (lua_State *L, int (*st)(const char*, STAT_STRUCT*)) {
-	struct stat info;
+	int i;
+	STAT_STRUCT info;
 	const char *file = luaL_checkstring (L, 1);
 
-	if (stat(file, &info)) {
+	if (st(file, &info)) {
 		lua_pushnil (L);
 		lua_pushfstring (L, "cannot obtain information from file `%s'", file);
 		return 2;
 	}
-	lua_newtable (L);
+	if (lua_isstring (L, 2)) {
-	/* device inode resides on */
+		int v;
-	lua_pushliteral (L, "dev");
+		const char *member = lua_tostring (L, 2);
-	lua_pushnumber (L, (lua_Number)info.st_dev);
+		if (strcmp (member, "mode") == 0) v = 0;
-	lua_rawset (L, -3);
-	/* inode's number */
-	lua_pushliteral (L, "ino");
-	lua_pushnumber (L, (lua_Number)info.st_ino);
-	lua_rawset (L, -3);
-	/* inode protection mode */
-	lua_pushliteral (L, "mode");
-	lua_pushstring (L, mode2string (info.st_mode));
-	lua_rawset (L, -3);
-	/* number of hard links to the file */
-	lua_pushliteral (L, "nlink");
-	lua_pushnumber (L, (lua_Number)info.st_nlink);
-	lua_rawset (L, -3);
-	/* user-id of owner */
-	lua_pushliteral (L, "uid");
-	lua_pushnumber (L, (lua_Number)info.st_uid);
-	lua_rawset (L, -3);
-	/* group-id of owner */
-	lua_pushliteral (L, "gid");
-	lua_pushnumber (L, (lua_Number)info.st_gid);
-	lua_rawset (L, -3);
-	/* device type, for special file inode */
-	lua_pushliteral (L, "rdev");
-	lua_pushnumber (L, (lua_Number)info.st_rdev);
-	lua_rawset (L, -3);
-	/* time of last access */
-	lua_pushliteral (L, "access");
-	lua_pushnumber (L, info.st_atime);
-	lua_rawset (L, -3);
-	/* time of last data modification */
-	lua_pushliteral (L, "modification");
-	lua_pushnumber (L, info.st_mtime);
-	lua_rawset (L, -3);
-	/* time of last file status change */
-	lua_pushliteral (L, "change");
-	lua_pushnumber (L, info.st_ctime);
-	lua_rawset (L, -3);
-	/* file size, in bytes */
-	lua_pushliteral (L, "size");
-	lua_pushnumber (L, (lua_Number)info.st_size);
-	lua_rawset (L, -3);
 #ifndef _WIN32
-	/* blocks allocated for file */
+		else if (strcmp (member, "blocks")  == 0) v = 11;
-	lua_pushliteral (L, "blocks");
+		else if (strcmp (member, "blksize") == 0) v = 12;
-	lua_pushnumber (L, (lua_Number)info.st_blocks);
-	lua_rawset (L, -3);
-	/* optimal file system I/O blocksize */
-	lua_pushliteral (L, "blksize");
-	lua_pushnumber (L, (lua_Number)info.st_blksize);
-	lua_rawset (L, -3);
 #endif
-
+		else /* look for member */
+			for (v = 1; members[v].name; v++)
+				if (*members[v].name == *member)
+					break;
+		/* push member value and return */
+		members[v].push (L, &info);
+		return 1;
+	} else if (!lua_istable (L, 2))
+		/* creates a table if none is given */
+		lua_newtable (L);
+	/* stores all members in table on top of the stack */
+	for (i = 0; members[i].name; i++) {
+		lua_pushstring (L, members[i].name);
+		members[i].push (L, &info);
+		lua_rawset (L, -3);
+	}
 	return 1;
 }
 
 
+/*
+** Get file information using stat.
+*/
+static int file_info (lua_State *L) {
+	return _file_info_ (L, STAT_FUNC);
+}
+
+
+/*
+** Get symbolic link information using lstat.
+*/
+#ifndef _WIN32
+static int link_info (lua_State *L) {
+	return _file_info_ (L, LSTAT_FUNC);
+}
+#else
+static int link_info (lua_State *L) {
+  lua_pushboolean(L, 0);
+  lua_pushliteral(L, "symlinkattributes not supported on this platform");
+  return 2;
+}
+#endif
+
+
 /*
 ** Assumes the table is on top of the stack.
 */
 static void set_info (lua_State *L) {
 	lua_pushliteral (L, "_COPYRIGHT");
-	lua_pushliteral (L, "Copyright (C) 2004-2005 Kepler Project");
+	lua_pushliteral (L, "Copyright (C) 2003 Kepler Project");
 	lua_settable (L, -3);
 	lua_pushliteral (L, "_DESCRIPTION");
 	lua_pushliteral (L, "LuaFileSystem is a Lua library developed to complement the set of functions related to file systems offered by the standard Lua distribution");
 	lua_settable (L, -3);
-	lua_pushliteral (L, "_NAME");
-	lua_pushliteral (L, "LuaFileSystem");
-	lua_settable (L, -3);
 	lua_pushliteral (L, "_VERSION");
-	lua_pushliteral (L, "1.1");
+	lua_pushliteral (L, "LuaFileSystem 1.4.2");
 	lua_settable (L, -3);
 }
 
@@ -519,6 +683,9 @@ static const struct luaL_reg fslib[] = {
 	{"dir", dir_iter_factory},
 	{"lock", file_lock},
 	{"mkdir", make_dir},
+	{"rmdir", remove_dir},
+	{"symlinkattributes", link_info},
+	{"setmode", lfs_f_setmode},
 	{"touch", file_utime},
 	{"unlock", file_unlock},
 	{NULL, NULL},
@@ -526,7 +693,7 @@ static const struct luaL_reg fslib[] = {
 
 int luaopen_lfs (lua_State *L) {
 	dir_create_meta (L);
-	luaL_openlib (L, "lfs", fslib, 0);
+	luaL_register (L, "lfs", fslib);
 	set_info (L);
 	return 1;
 }

src/lfs.def

@@ -0,0 +1,5 @@
+LIBRARY lfs.dll
+DESCRIPTION "LuaFileSystem"
+VERSION 1.4.2
+EXPORTS
+luaopen_lfs

src/lfs.h

@@ -1,5 +1,11 @@
+/*
+** LuaFileSystem
+** Copyright Kepler Project 2003 (http://www.keplerproject.org/luafilesystem)
+**
+** $Id: lfs.h,v 1.5 2008/02/19 20:08:23 mascarenhas Exp $
+*/
+
 /* Define 'chdir' for systems that do not implement it */
-/* $Id: lfs.h,v 1.1 2004/07/29 14:26:33 tomas Exp $ */
 #ifdef NO_CHDIR
 #define chdir(p)	(-1)
 #define chdir_error	"Function 'chdir' not provided by system"
@@ -7,4 +13,5 @@
 #define chdir_error	strerror(errno)
 #endif
 
+
 int luaopen_lfs (lua_State *L);

tests/test.lua

@@ -1,15 +1,16 @@
-#!/usr/local/bin/lua
+#!/usr/local/bin/lua5.1
 
 local tmp = "/tmp"
 local sep = "/"
 local upper = ".."
 
 require"lfs"
+print (lfs._VERSION)
 
 function attrdir (path)
 	for file in lfs.dir(path) do
 		if file ~= "." and file ~= ".." then
-			local f = path..'/'..file
+			local f = path..sep..file
 			print ("\t=> "..f.." <=")
 			local attr = lfs.attributes (f)
 			assert (type(attr) == "table")
@@ -31,32 +32,82 @@ assert (lfs.chdir (upper), "could not change to upper directory")
 assert (lfs.chdir (reldir), "could not change back to current directory")
 assert (lfs.currentdir() == current, "error trying to change directories")
 assert (lfs.chdir ("this couldn't be an actual directory") == nil, "could change to a non-existent directory")
+
 -- Changing creating and removing directories
-local tmpdir = tmp.."/lfs_tmp_dir"
+local tmpdir = current..sep.."lfs_tmp_dir"
+local tmpfile = tmpdir..sep.."tmp_file"
+-- Test for existence of a previous lfs_tmp_dir
+-- that may have resulted from an interrupted test execution and remove it
+if lfs.chdir (tmpdir) then
+    assert (lfs.chdir (upper), "could not change to upper directory")
+    assert (os.remove (tmpfile), "could not remove file from previous test")    
+    assert (lfs.rmdir (tmpdir), "could not remove directory from previous test")
+end
+
+-- tries to create a directory
 assert (lfs.mkdir (tmpdir), "could not make a new directory")
 local attrib, errmsg = lfs.attributes (tmpdir)
 if not attrib then
 	error ("could not get attributes of file `"..tmpdir.."':\n"..errmsg)
-else
-	-- Change access time
-	assert (lfs.touch (tmpdir, 11))
-	local new_att = assert (lfs.attributes (tmpdir))
-	assert (new_att.access == 11, "could not set access time")
-	assert (new_att.modification == 11, "could not set modification time")
-	-- Change access and modification time
-	assert (lfs.touch (tmpdir, 33, 22))
-	local new_att = assert (lfs.attributes (tmpdir))
-	assert (new_att.access == 33, "could not set access time")
-	assert (new_att.modification == 22, "could not set modification time")
-	-- Restore access time to current value
-	assert (lfs.touch (tmpdir))
-	new_att = assert (lfs.attributes (tmpdir))
-	assert (new_att.access == attrib.access)
-	assert (new_att.modification == attrib.modification)
 end
-assert (os.remove (tmpdir), "could not remove new directory")
+local f = io.open(tmpfile, "w")
-assert (lfs.mkdir (tmpdir.."/lfs_tmp_dir") == false, "could create a directory inside a non-existent one")
+f:close()
--- 
+
+-- Change access time
+local testdate = os.time({ year = 2007, day = 10, month = 2, hour=0})
+assert (lfs.touch (tmpfile, testdate))
+local new_att = assert (lfs.attributes (tmpfile))
+assert (new_att.access == testdate, "could not set access time")
+assert (new_att.modification == testdate, "could not set modification time")
+
+-- Change access and modification time
+local testdate1 = os.time({ year = 2007, day = 10, month = 2, hour=0})
+local testdate2 = os.time({ year = 2007, day = 11, month = 2, hour=0})
+
+assert (lfs.touch (tmpfile, testdate2, testdate1))
+local new_att = assert (lfs.attributes (tmpfile))
+assert (new_att.access == testdate2, "could not set access time")
+assert (new_att.modification == testdate1, "could not set modification time")
+
+local res, err = lfs.symlinkattributes(tmpfile)
+if err ~= "symlinkattributes not supported on this platform" then
+    -- Checking symbolic link information (does not work in Windows)
+    assert (os.execute ("ln -s "..tmpfile.." _a_link_for_test_"))
+    assert (lfs.attributes"_a_link_for_test_".mode == "file")
+    assert (lfs.symlinkattributes"_a_link_for_test_".mode == "link")
+    assert (os.remove"_a_link_for_test_")
+end
+
+if lfs.setmode then
+    -- Checking text/binary modes (works only in Windows)
+    local f = io.open(tmpfile, "w")
+    local result, mode = lfs.setmode(f, "binary")
+    assert((result and mode == "text") or (not result and mode == "setmode not supported on this platform"))
+    result, mode = lfs.setmode(f, "text")
+    assert((result and mode == "binary") or (not result and mode == "setmode not supported on this platform"))
+    f:close()
+end
+    
+-- Restore access time to current value
+assert (lfs.touch (tmpfile, attrib.access, attrib.modification))
+new_att = assert (lfs.attributes (tmpfile))
+assert (new_att.access == attrib.access)
+assert (new_att.modification == attrib.modification)
+
+-- Remove new file and directory
+assert (os.remove (tmpfile), "could not remove new file")
+assert (lfs.rmdir (tmpdir), "could not remove new directory")
+assert (lfs.mkdir (tmpdir..sep.."lfs_tmp_dir") == nil, "could create a directory inside a non-existent one")
+
+-- Trying to get attributes of a non-existent file
 assert (lfs.attributes ("this couldn't be an actual file") == nil, "could get attributes of a non-existent file")
 assert (type(lfs.attributes (upper)) == "table", "couldn't get attributes of upper directory")
+
+-- Stressing directory iterator
+count = 0
+for i = 1, 4000 do
+	for file in lfs.dir (tmp) do
+		count = count + 1
+	end
+end
 print"Ok!"

vc6/lfs.def

@@ -1,5 +1,5 @@
 LIBRARY lfs.dll
 DESCRIPTION "LuaFileSystem"
-VERSION 1.1
+VERSION 1.2
 EXPORTS
 luaopen_lfs

vc6/luafilesystem_dll.dsp

@@ -56,7 +56,7 @@ LINK32=link.exe
 # ADD LINK32 lua50.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../bin/vc6/lfs.dll" /libpath:"../../external-src/lua50/lib/dll"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=cd ../bin/vc6	zip.exe lfs-1.1-win32.zip lfs.dll
+PostBuild_Cmds=cd ../bin/vc6	zip.exe luafilesystem-1.2-win32.zip lfs.dll
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "luafilesystem_dll - Win32 Debug"