Correcting the detection of the manifest file

Added documentation for lfs.setmode

Makefile

@@ -1,40 +1,22 @@
-# $Id: Makefile,v 1.9 2004/11/10 14:44:01 tuler Exp $
+# $Id: Makefile,v 1.32 2008/02/11 22:42:21 carregal Exp $
 
 T= lfs
+V= 1.4.0
+CONFIG= ./config
 
-include ./config
+include $(CONFIG)
 
-V= 1.0b
-DIST_DIR= luafilesystem-$V
-TAR_FILE= $(DIST_DIR).tar.gz
-ZIP_FILE= $(DIST_DIR).zip
-LIBNAME= lib$T.$V$(LIB_EXT)
+SRCS= src/$T.c
+OBJS= src/$T.o
 
-SRCS= $T.c
-OBJS= $T.o compat-5.1.o
+lib: src/lfs.so
 
+src/lfs.so: $(OBJS)
+	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/lfs.so $(OBJS)
 
-lib: $(LIBNAME)
-
-$(LIBNAME): $(OBJS)
-	$(CC) $(CFLAGS) $(LIB_OPTION) -o $(LIBNAME) $(OBJS) $(LIBS)
-
-compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
-	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
-
-install: $(LIBNAME)
-	mkdir -p $(LIB_DIR)
-	cp $(LIBNAME) $(LIB_DIR)
-	ln -f -s $(LIB_DIR)/$(LIBNAME) $(LIB_DIR)/$T$(LIB_EXT)
+install: src/lfs.so
+	mkdir -p $(LUA_LIBDIR)
+	cp src/lfs.so $(LUA_LIBDIR)
 
 clean:
-	rm -f $L $(LIBNAME) $(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)
+	rm -f src/lfs.so $(OBJS)

Makefile.win

@@ -0,0 +1,26 @@
+# $Id: Makefile.win,v 1.10 2008/02/13 22:08:31 carregal Exp $
+
+T= lfs
+V= 1.4.0
+
+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,34 @@
+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
+
+Current version is 1.4.0
+
+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.ddl to your package.cpath directory
+
+Documentation
+-------------
+Please check the documentation at /doc/us/ for more information.

config

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

config.win

@@ -0,0 +1,17 @@
+# 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= $(WARN) $(INCS)
+CC= cl
+
+# $Id: config.win,v 1.4 2007/05/18 19:52:59 carregal Exp $

doc/us/examples.html

@@ -0,0 +1,103 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<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">
+		<img alt="LuaFileSystem" src="luafilesystem.png"/>
+	    </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" -->
+
+<div id="main">
+	
+<div id="navigation">
+<h1>LuaFileSystem</h1>
+	<ul>
+		<li><a href="index.html">Home</a>
+			<ul>
+				<li><a href="index.html#overview">Overview</a></li>
+				<li><a href="index.html#status">Status</a></li>
+				<li><a href="index.html#download">Download</a></li>
+				<li><a href="index.html#history">History</a></li>
+				<li><a href="index.html#credits">Credits</a></li>
+				<li><a href="index.html#contact">Contact us</a></li>
+			</ul>
+		</li>
+		<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" -->
+
+<div id="content">
+
+<h2><a name="example"></a>Examples</h2>
+
+<h3>Directory iterator</h3>
+
+<p>The following example iterates over a directory and recursively lists the
+attributes for each file inside it.</p>
+
+<pre class="example">
+require"lfs"
+
+function attrdir (path)
+    for file in lfs.dir(path) do
+        if file ~= "." and file ~= ".." then
+            local f = path..'/'..file
+            print ("\t "..f)
+            local attr = lfs.attributes (f)
+            assert (type(attr) == "table")
+            if attr.mode == "directory" then
+                attrdir (f)
+            else
+                for name, value in pairs(attr) do
+                    print (name, value)
+                end
+            end
+        end
+    end
+end
+
+attrdir (".")
+</pre>
+
+</div> <!-- id="content" -->
+
+</div> <!-- id="main" -->
+
+<div id="about">
+	<p><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a></p>
+	<p><small>$Id: examples.html,v 1.8 2007/12/14 15:28:04 carregal Exp $</small></p>
+</div> <!-- id="about" -->
+
+</div> <!-- id="container" -->
+
+</body>
+</html>

doc/us/index.html

@@ -1,122 +1,167 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-<meta name="generator" content="HTML Tidy, see www.w3.org">
-<title>LuaFileSystem</title>
-<style type="text/css">
-ul { list-style-type: disc };
-</style>
+	<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 bgcolor="#FFFFFF">
-<center>
-<table border="0" cellspacing="2" cellpadding="2">
-<tr>
-<td align="center"><a href="http://www.keplerproject.org"><img
-border="0" alt="LuaFileSystem" src="luafilesystem.png"></a> </td>
-</tr>
 
-<tr>
-<td align="center"><big><b>LuaFileSystem</b></big> </td>
-</tr>
+<body>
 
-<tr>
-<td align="center" valign="top">File System Library for the <a
-href="http://www.lua.org">Lua</a> Programming Language</td>
-</tr>
-</table>
-</center>
+<div id="container">
 
-<center><small><a href="#over">overview</a> &middot; <a href=
-"#download">download</a> &middot; <a href="manual.html">manual</a>
-&middot; <a href="#credits">credits</a> &middot; <a href=
-"#contact">contact us</a></small></center>
+<div id="product">
+	<div id="product_logo">
+        <a href="http://www.keplerproject.org">
+		<img alt="LuaFileSystem" src="luafilesystem.png"/>
+	    </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" -->
 
-<hr>
-<h2>Contents</h2>
+<div id="main">
+	
+<div id="navigation">
+<h1>LuaFileSystem</h1>
+	<ul>
+		<li><strong>Home</strong>
+			<ul> 
+				<li><a href="index.html#overview">Overview</a></li>
+				<li><a href="index.html#status">Status</a></li>
+				<li><a href="index.html#download">Download</a></li>
+				<li><a href="index.html#history">History</a></li>
+				<li><a href="index.html#credits">Credits</a></li>
+				<li><a href="index.html#contact">Contact us</a></li>
+			</ul>
+		</li>
+		<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" -->
 
-<ul>
-<li><a href="#over">Overview</a></li>
+<div id="content">
 
-<li><a href="#version">Current Version</a></li>
+<h2><a name="overview"></a>Overview</h2>
 
-<li><a href="#download">Download</a></li>
+<p>LuaFileSystem is a <a href="http://www.lua.org">Lua</a> library
+developed to complement the set of functions related to file
+systems offered by the standard Lua distribution.</p>
 
-<li><a href="#manual">Manual</a></li>
+<p>LuaFileSystem offers a portable way to access
+the underlying directory structure and file attributes.</p>
 
-<li><a href="#credits">Credits</a></li>
+<p>LuaFileSystem is free software and uses the same
+<a href="license.html">license</a> as Lua 5.1.</p>
 
-<li><a href="#contact">Contact us</a></li>
-</ul>
+<h2><a name="status"></a>Status</h2>
 
-<a name="over"></a> 
+<p>Current version is 1.4.0. It was developed for Lua 5.1.</p>
 
-<h2>Overview</h2>
+<h2><a name="download"></a>Download</h2>
 
-<p>LuaFileSystem is a library developed to complement the set of
-functions related to file systems offered by the standard Lua
-distribution. One of its goals is to be as portable as Lua.</p>
+<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://luabinaries.luaforge.net">LuaBinaries</a> 5.1.3 a Windows binary
+version of LuaFileSystem (compiled with Visual Studio 2005 Express) can be found at the same LuaForge page.</p>
 
-<p>LuaFileSystem is free software and uses the same <a href=
-"license.html">license</a> as Lua 5.0. <a name="version"></a></p>
+<h2><a name="history"></a>History</h2>
 
-<h2>Current version</h2>
+<dl class="history">
+    <dt><strong>Version 1.4.0</strong> [13/Feb/2008]</dt>
+    <dd>
+    <ul>
+	<li><a href="manual.html#attributes"><code>lfs.attributes</code></a>
+	raises an error if attribute does not exist</li>
+	<li>added function
+	<a href="manual.html#setmode"><code>lfs.setmode</code></a>
+        (works only in non Windows systems).</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>
 
-<p>Current version is 1.0 beta. It was developed for Lua 5.0.</p>
+    <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>
 
-<p>Version 1.0 follows the <a href=
-"http://www.keplerproject.org/compat">package proposal</a> for Lua
-5.1 (see section <a href="#installation">Installation</a> for more
-details). <a name="download"></a></p>
+    <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>
 
-<h2>Download</h2>
+    <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>
 
-<p>LuaFileSystem can be downloaded from its <a href=
-"http://luaforge.net/project/showfiles.php?group_id=66">Lua
-Forge</a> page. <a name="new"></a></p>
+    <dt><strong><a href="http://www.keplerproject.org/luafilesystem/1.0/">Version 1.0</a></strong> [21/Jan/2005]</dt>
+    <dd />
 
-<h2>What's new</h2>
+    <dt><strong>Version 1.0 Beta</strong> [10/Nov/2004]</dt>
+    <dd />
+</dl>
 
-<ul>
-<li>[10/nov/2004] Version 1.0 beta released</li>
-</ul>
-
-<a name="installation"></a> 
-
-<h2>Installation</h2>
-
-<p>LuaFileSystem is distributed as a pair of C source and header
-files. The distribution provides a <tt>Makefile</tt> prepared to
-compile the library and install it. The file <tt>config</tt> should
-be edited to suit the needs of the aimed platform.</p>
-
-<p>LuaFileSystem follows the <a href=
-"http://www.keplerproject.org/compat">package proposal</a> for Lua
-5.1, therefore this package should be "installed". In other words,
-if you are using Lua 5.0, the files <tt>compat-5.1.c</tt> and
-<tt>compat-5.1.h</tt> must be used in the compilation and the file
-<tt>compat-5.1.lua</tt> must be installed in the <tt>LUA_PATH</tt>.
-If you are using Lua 5.1, nothing should be done.</p>
-
-<a name="credits"></a> 
-
-<h2>Credits</h2>
+<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 <a
-href="http://www.keplerproject.org">The Kepler Project</a> which
-holds its copyright.</p>
+Andr&eacute; Carregal and Tom&aacute;s Guisasola as part of the
+<a href="http://www.keplerproject.org">Kepler Project</a>,
+which holds its copyright.</p>
 
-<a name="contact"></a> 
+<h2><a name="contact"></a>Contact us</h2>
 
-<h2>Contact us</h2>
-
-<p>For more information please <a href=
-"mailto:info-NO-SPAM-THANKS@keplerproject.org">contact us</a>.
+<p>For more information please
+<a href="mailto:info-NO-SPAM-THANKS@keplerproject.org">contact us</a>.
 Comments are welcome!</p>
 
-<hr>
-<small>$Id: index.html,v 1.6 2004/11/11 15:33:20 tomas Exp
-$</small>
+<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">Valid XHTML 1.0!</a></p>
+	<p><small>$Id: index.html,v 1.40 2008/02/13 21:00:10 carregal Exp $</small></p>
+</div> <!-- id="about" -->
+
+</div> <!-- id="container" -->
+
 </body>
 </html>
-

doc/us/license.html

@@ -1,23 +1,78 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-<meta name="generator" content="HTML Tidy, see www.w3.org">
-<title>LuaFileSystem: license</title>
+	<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 bgcolor="#FFFFFF">
-<hr>
+
+<body>
+
+<div id="container">
+
+<div id="product">
+	<div id="product_logo">
+        <a href="http://www.keplerproject.org">
+		<img alt="LuaFileSystem" src="luafilesystem.png"/>
+	    </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" -->
+
+<div id="main">
+	
+<div id="navigation">
+<h1>LuaFileSystem</h1>
+	<ul>
+		<li><a href="index.html">Home</a>
+			<ul>
+				<li><a href="index.html#overview">Overview</a></li>
+				<li><a href="index.html#status">Status</a></li>
+				<li><a href="index.html#download">Download</a></li>
+				<li><a href="index.html#history">History</a></li>
+				<li><a href="index.html#credits">Credits</a></li>
+				<li><a href="index.html#contact">Contact us</a></li>
+			</ul>
+		</li>
+		<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" -->
+
+<div id="content">
+
 <h1>License</h1>
 
+<p>
 LuaFileSystem is free software: it can be used for both academic
 and commercial purposes at absolutely no cost. There are no
 royalties or GNU-like "copyleft" restrictions. LuaFileSystem
-qualifies as <a href=
-"http://www.opensource.org/docs/definition.html">Open Source</a>
-software. Its licenses are compatible with <a href=
-"http://www.gnu.org/licenses/gpl.html">GPL</a>. LuaFileSystem is
-not in the public domain and <a href=
-"http://www.keplerproject.org">The Kepler Project</a> keep its
-copyright. The legal details are below. 
+qualifies as
+<a href="http://www.opensource.org/docs/definition.html">Open Source</a>
+software.
+Its licenses are compatible with
+<a href="http://www.gnu.org/licenses/gpl.html">GPL</a>.
+LuaFileSystem is not in the public domain and the
+<a href="http://www.keplerproject.org">Kepler Project</a>
+keep its copyright.
+The legal details are below. 
+</p>
 
 <p>The spirit of the license is that you are free to use
 LuaFileSystem for any purpose at no cost without having to ask us.
@@ -29,12 +84,8 @@ somewhere in your product or its documentation.</p>
 Ierusalimschy, Andr&eacute; Carregal and Tom&aacute;s Guisasola.
 The implementation is not derived from licensed software.</p>
 
-<p>
-<!-- =====================================================================  -->
-</p>
-
-<hr>
-Copyright &copy; 2004 The Kepler Project. 
+<hr/>
+<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
@@ -56,13 +107,16 @@ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.</p>
 
-<p>
-<!-- =====================================================================  -->
-</p>
+</div> <!-- id="content" -->
+
+</div> <!-- id="main" -->
+
+<div id="about">
+	<p><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a></p>
+	<p><small>$Id: license.html,v 1.13 2008/02/11 22:42:21 carregal Exp $</small></p>
+</div><!-- id="about" -->
+
+</div><!-- id="container" -->
 
-<hr>
-<small>$Id: license.html,v 1.1.1.1 2004/07/27 14:15:24 tomas Exp
-$</small>
 </body>
 </html>
-

doc/us/manual.html

@@ -1,197 +1,257 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-<meta name="generator" content="HTML Tidy, see www.w3.org">
-<title>LuaFileSystem</title>
-<style type="text/css">
-ul { list-style-type: disc };
-</style>
+	<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 bgcolor="#FFFFFF">
-<hr>
-<center>
-<table border="0" cellspacing="2" cellpadding="2">
-<tr>
-<td align="center"><a href=
-"http://www.keplerproject.org/luafilesystem"><img border="0" alt=
-"LuaFileSystem logo" src="luafilesystem.png"></a> </td>
-</tr>
 
-<tr>
-<td align="center"><big><b>LuaFileSystem Reference Manual</b></big>
-</td>
-</tr>
+<body>
 
-<tr>
-<td align="center" valign="top">File system library for the <a
-href="http://www.lua.org">Lua</a> programming language</td>
-</tr>
-</table>
-</center>
+<div id="container">
 
-<center><small><a href="index.html">home</a> &middot; <a href=
-"#introduction">introduction</a> &middot; <a href=
-"#reference">reference</a> &middot; <a href=
-"#example">example</a></small></center>
+<div id="product">
+	<div id="product_logo">
+        <a href="http://www.keplerproject.org"><img alt="LuaFileSystem" src="luafilesystem.png"/></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" -->
 
-<hr>
-<a name="introduction"></a> 
+<div id="main">
+	
+<div id="navigation">
+<h1>LuaFileSystem</h1>
+	<ul>
+		<li><a href="index.html">Home</a>
+			<ul>
+				<li><a href="index.html#overview">Overview</a></li>
+				<li><a href="index.html#status">Status</a></li>
+				<li><a href="index.html#download">Download</a></li>
+				<li><a href="index.html#history">History</a></li>
+				<li><a href="index.html#credits">Credits</a></li>
+				<li><a href="index.html#contact">Contact us</a></li>
+			</ul>
+		</li>
+		<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" -->
 
-<h2>Introduction</h2>
+<div id="content">
+
+<h2><a name="introduction"></a>Introduction</h2>
 
 <p>LuaFileSystem is a <a href="http://www.lua.org">Lua</a> library
 developed to complement the set of functions related to file
 systems offered by the standard Lua distribution.</p>
 
-<p>LuaFileSystem is free software and uses the same <a href=
-"license.html">license</a> as Lua 5.0.</p>
+<p>LuaFileSystem offers a portable way to access
+the underlying directory structure and file attributes.</p>
 
-<a name="reference"></a> 
+<h2><a name="building"></a>Building</h2>
 
-<h2>Reference</h2>
+<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 the following functions:</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>
 
-<ul>
-<li style="list-style: none"><a name="attributes"></a></li>
+<h2><a name="installation"></a>Installation</h2>
 
-<li><b><tt>lfs.attributes (filepath)</tt></b><br>
- Obtains the file attributes. The attributes are: 
+<p>The easiest way to install LuaFileSystem is to use LuaRocks:</p>
 
-<div style="margin-left: 2em"><i>dev</i>, device inode resides
-on;<br>
- <i>ino</i>, inode's number;<br>
- <i>mode</i>, inode protection mode (<small>values could be
-<tt>file</tt>, <tt>directory</tt>, <tt>link</tt>, <tt>socket</tt>,
-<tt>named pipe</tt>, <tt>char device</tt>, <tt>block device</tt> or
-<tt>other</tt></small>);<br>
- <i>nlink</i>, number of hard links to the file;<br>
- <i>uid</i>, user-id of owner;<br>
- <i>gid</i>, group-id of owner;<br>
- <i>rdev</i>, device type, for special file inode;<br>
- <i>access</i>, time of last access;<br>
- <i>modification</i>, time of last data modification;<br>
- <i>change</i>, time of last file status change;<br>
- <i>size</i>, file size, in bytes;<br>
- <i>blocks</i>, block allocated for file; (Unix only)<br>
- <i>blksize</i>, optimal file system I/O blocksize; (Unix only)<br>
-</div>
-
-Returns a table with file attributes described above. <a name=
-"chdir"></a></li>
-
-<li><b><tt>lfs.chdir (path)</tt></b><br>
- Changes the current working directory to the given
-<tt>path</tt>.<br>
- Returns <tt>true</tt> in case of success or <tt>nil</tt> plus an
-error string. <a name="getcwd"></a></li>
-
-<li><b><tt>lfs.currentdir ()</tt></b><br>
- Returns a string with the current working directory or
-<code>nil</code> plus an error string. <a name="dir"></a></li>
-
-<li><b><tt>lfs.dir (path)</tt></b><br>
- Lua iterator over the entries of a given directory. Raises an
-error if <tt>path</tt> is not a directory. <a name="lock"></a></li>
-
-<li><b><tt>lfs.lock (filehandle, mode[, start[,
-length]])</tt></b><br>
- Locks a file or a part of it. This function works on <em>open
-files</em>; the file handle should be specified as the first
-argument. The string <code>mode</code> could be either
-<code>r</code> (for a read/shared lock) or <code>w</code> (for a
-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
-case of error, it returns <code>false</code> plus an error string.
-<a name="mkdir"></a></li>
-
-<li><b><tt>lfs.mkdir (dirname)</tt></b><br>
- Creates a new directory. The argument is the name of the new
-directory.<br>
- Returns a boolean indicating whether the operation succeeds or not
-(in this case, an error string is returned too). <a name=
-"unlock"></a></li>
-
-<li><b><tt>lfs.unlock (filehandle[, start[, length]])</tt></b><br>
- Unlocks a file or a part of it. This function works on <em>open
-files</em>; the file handle should be specified as the first
-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
-case of error, it returns <code>false</code> plus a string
-describing the error.</li>
-</ul>
-
-<a name="example"></a> 
-
-<h2>Example</h2>
-
-<pre>
-require"lfs"
-
-function attrdir (path)
-    for file in lfs.dir(path) do
-        if file ~= "." and file ~= ".." then
-            local f = path..'/'..file
-            print ("\t "..f)
-            local attr = lfs.attributes (f)
-            assert (type(attr) == "table")
-            if attr.mode == "directory" then
-                attrdir (f)
-            else
-                for name, value in pairs(attr) do
-                    print (name, value)
-                end
-            end
-        end
-    end
-end
-
-attrdir (".")
+<pre class="example">
+luarocks install luafilesystem
 </pre>
 
-<a name="contents"></a> 
+<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>Contents</h2>
+<h2><a name="reference"></a>Reference</h2>
 
-<ul>
-<li><a href="#introduction">Introduction</a></li>
+<p>
+LuaFileSystem offers the following functions:
+</p>
 
-<li><a href="#reference">Reference</a> 
+<dl class="reference">
+    <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> (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, 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, 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
+        <code>file</code>, <code>directory</code>, <code>link</code>, <code>socket</code>,
+        <code>named pipe</code>, <code>char device</code>, <code>block device</code> or
+        <code>other</code>)</dd>
+        
+        <dt><strong><code>nlink</code></strong></dt>
+		<dd>number of hard links to the file</dd>
 
-<ul>
-<li><a href="#chdir">chdir</a></li>
+        <dt><strong><code>uid</code></strong></dt>
+		<dd>user-id of owner (Unix only, always 0 on Windows)</dd>
 
-<li><a href="#currentdir">currentdir</a></li>
+        <dt><strong><code>gid</code></strong></dt>
+		<dd>group-id of owner (Unix only, always 0 on Windows)</dd>
 
-<li><a href="#dir">dir</a></li>
+        <dt><strong><code>rdev</code></strong></dt>
+		<dd>on Unix systems, represents the device type, for special file inodes.
+        On Windows systems represents the same as <code>dev</code></dd>
 
-<li><a href="#lock">lock</a></li>
+        <dt><strong><code>access</code></strong></dt>
+		<dd>time of last access</dd>
 
-<li><a href="#mkdir">mkdir</a></li>
+        <dt><strong><code>modification</code></strong></dt>
+		<dd>time of last data modification</dd>
 
-<li><a href="#unlock">unlock</a></li>
-</ul>
-</li>
+        <dt><strong><code>change</code></strong></dt>
+		<dd>time of last file status change</dd>
 
-<li><a href="#examples">Examples</a></li>
-</ul>
+        <dt><strong><code>size</code></strong></dt>
+		<dd>file size, in bytes</dd>
 
-<br>
-<br>
- 
+        <dt><strong><code>blocks</code></strong></dt>
+		<dd>block allocated for file; (Unix only)</dd>
+        
+        <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>
 
-<center><small><a href="index.html">home</a> &middot; <a href=
-"#introduction">introduction</a> &middot; <a href=
-"#reference">reference</a> &middot; <a href=
-"#example">example</a></small></center>
+    <dt><a name="chdir"></a><strong><code>lfs.chdir (path)</code></strong></dt>
+    <dd>Changes the current working directory to the given
+    <code>path</code>.<br />
+    Returns <code>true</code> in case of success or <code>nil</code> plus an
+    error string.</dd>
+        
+    <dt><a name="getcwd"></a><strong><code>lfs.currentdir ()</code></strong></dt>
+    <dd>Returns a string with the current working directory or <code>nil</code>
+    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.
+    Each time the iterator is called it returns a string with an entry of the
+    directory; <code>nil</code> is returned when there is 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
+    file handle should be specified as the first argument.
+    The string <code>mode</code> could be either
+    <code>r</code> (for a read/shared lock) or <code>w</code> (for a
+    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 <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="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 <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="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 (filepath, 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
+    a bind to <code>utime</code> function. The first argument is the
+    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.time</code>).
+    If the modification time is omitted, the access time provided is used;
+    if both times are omitted, the current time is used.<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="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
+    <em>open files</em>; the file handle should be specified as the first
+    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 <code>true</code> if the operation was successful;
+    in case of error, it returns <code>nil</code> plus an error string.
+    </dd>
+</dl>
+
+</div> <!-- id="content" -->
+
+</div> <!-- id="main" -->
+
+<div id="about">
+	<p><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a></p>
+	<p><small>$Id: manual.html,v 1.40 2008/02/11 22:48:16 carregal Exp $</small></p>
+</div> <!-- id="about" -->
+
+</div> <!-- id="container" -->
 
-<hr>
-<small>$Id: manual.html,v 1.7 2004/11/10 14:09:45 tuler Exp
-$</small>
 </body>
 </html>
-

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/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-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)"
+       	}
+     }
+  }
+}

src/lfs.c

@@ -1,15 +1,22 @@
 /*
+** LuaFileSystem
+** Copyright Kepler Project 2003 (http://www.keplerproject.org/luafilesystem)
+**
 ** File system manipulation library.
 ** This library offers these functions:
 **   lfs.attributes (filepath [, attributename])
 **   lfs.chdir (path)
 **   lfs.currentdir ()
 **   lfs.dir (path)
-**   lfs.mkdir (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.14 2004/11/17 14:08:04 tomas Exp $
+** $Id: lfs.c,v 1.47 2008/02/11 22:42:21 carregal Exp $
 */
 
 #include <errno.h>
@@ -18,22 +25,23 @@
 #include <time.h>
 #include <sys/stat.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <direct.h>
 #include <io.h>
 #include <sys/locking.h>
+#include <sys/utime.h>
+#include <fcntl.h>
 #else
 #include <unistd.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/types.h>
+#include <utime.h>
 #endif
 
 #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 */
@@ -51,14 +59,26 @@
 
 #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
+#define lfs_setmode(L,file,m)   ((void)L, _setmode(_fileno(file), m))
+#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 non Windows platforms"), -1)
+#endif
+
 /*
 ** This function changes the working (current) directory
 */
@@ -81,16 +101,17 @@ static int change_dir (lua_State *L) {
 **  and a string describing the error
 */
 static int get_dir (lua_State *L) {
-	char path[255+2];
-	if (getcwd(path, 255) == NULL) {
-		lua_pushnil(L);
-		lua_pushstring(L, getcwd_error);
-		return 2;
-	}
-	else {
-		lua_pushstring(L, path);
-		return 1;
-	}
+  char *path;
+  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;
+  }
 }
 
 /*
@@ -114,13 +135,13 @@ static FILE *check_file (lua_State *L, int idx, const char *funcname) {
 */
 static int _file_lock (lua_State *L, FILE *fh, const char *mode, const long start, long len, const char *funcname) {
 	int code;
-#ifdef WIN32
+#ifdef _WIN32
 	/* lkmode valid values are:
-	   _LK_LOCK    Locks the specified bytes. If the bytes cannot be locked, the program immediately tries again after 1 second. If, after 10 attempts, the bytes cannot be locked, the constant returns an error.
-	   _LK_NBLCK   Locks the specified bytes. If the bytes cannot be locked, the constant returns an error.
-	   _LK_NBRLCK  Same as _LK_NBLCK.
-	   _LK_RLCK    Same as _LK_LOCK.
-	   _LK_UNLCK   Unlocks the specified bytes, which must have been previously locked.
+	   LK_LOCK    Locks the specified bytes. If the bytes cannot be locked, the program immediately tries again after 1 second. If, after 10 attempts, the bytes cannot be locked, the constant returns an error.
+	   LK_NBLCK   Locks the specified bytes. If the bytes cannot be locked, the constant returns an error.
+	   LK_NBRLCK  Same as _LK_NBLCK.
+	   LK_RLCK    Same as _LK_LOCK.
+	   LK_UNLCK   Unlocks the specified bytes, which must have been previously locked.
 
 	   Regions should be locked only briefly and should be unlocked before closing a file or exiting the program.
 
@@ -128,10 +149,10 @@ static int _file_lock (lua_State *L, FILE *fh, const char *mode, const long star
 	*/
 	int lkmode;
 	switch (*mode) {
-		case 'r': lkmode = _LK_NBLCK; break;
-		case 'w': lkmode = _LK_NBLCK; break;
-		case 'u': lkmode = _LK_UNLCK; break;
-		default : luaL_error (L, "%s: invalid mode", funcname);
+		case 'r': lkmode = LK_NBLCK; break;
+		case 'w': lkmode = LK_NBLCK; break;
+		case 'u': lkmode = LK_UNLCK; break;
+		default : return luaL_error (L, "%s: invalid mode", funcname);
 	}
 	if (!len) {
 		fseek (fh, 0L, SEEK_END);
@@ -145,7 +166,7 @@ static int _file_lock (lua_State *L, FILE *fh, const char *mode, const long star
 		case 'w': f.l_type = F_WRLCK; break;
 		case 'r': f.l_type = F_RDLCK; break;
 		case 'u': f.l_type = F_UNLCK; break;
-		default : luaL_error (L, "%s: invalid mode", funcname);
+		default : return luaL_error (L, "%s: invalid mode", funcname);
 	}
 	f.l_whence = SEEK_SET;
 	f.l_start = (off_t)start;
@@ -156,6 +177,36 @@ static int _file_lock (lua_State *L, FILE *fh, const char *mode, const long star
 }
 
 
+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;
+  }
+}
+
+static int lfs_f_setmode(lua_State *L) {
+  return lfs_g_setmode(L, check_file(L, 1, "setmode"), 2);
+}
+
 /*
 ** Locks a file.
 ** @param #1 File handle.
@@ -172,7 +223,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;
 	}
@@ -193,44 +244,17 @@ 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;
-#ifdef WIN32
+#ifdef _WIN32
 	int oldmask = umask (0);
 	fail = _mkdir (path);
 #else
@@ -238,23 +262,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);
@@ -265,22 +313,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));
-	struct dirent *entry;
-	if ((entry = readdir (d)) != NULL) {
+	if ((entry = readdir (d->dir)) != 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
 }
 
@@ -289,15 +341,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)
-		closedir (d);
+	if (!d->closed && d->dir) {
+		closedir (d->dir);
+		d->closed = 1;
+	}
 #endif
 	return 0;
 }
@@ -308,21 +362,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));
-	dir->hFile = 0L;
+	d->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);
-	luaL_getmetatable (L, DIR_METATABLE);
-	lua_setmetatable (L, -2);
+		sprintf (d->pattern, "%s/*", path);
 #else
-	DIR **d = (DIR **) lua_newuserdata (L, sizeof(DIR *));
 	luaL_getmetatable (L, DIR_METATABLE);
 	lua_setmetatable (L, -2);
-	*d = opendir (path);
-	if (*d == NULL)
+	d->dir = opendir (path);
+	if (d->dir == NULL)
 		luaL_error (L, "cannot open %s: %s", path, strerror (errno));
 #endif
 	lua_pushcclosure (L, dir_iter, 1);
@@ -345,18 +399,32 @@ static int dir_create_meta (lua_State *L) {
 
 
 #ifdef _WIN32
- #define S_ISDIR(mode)  (mode&_S_IFDIR)
- #define S_ISREG(mode)  (mode&_S_IFREG)
- #define S_ISLNK(mode)  (0)
- #define S_ISSOCK(mode)  (0)
- #define S_ISFIFO(mode)  (0)
- #define S_ISCHR(mode)  (mode&_S_IFCHR)
- #define S_ISBLK(mode)  (0)
+ #ifndef S_ISDIR
+   #define S_ISDIR(mode)  (mode&_S_IFDIR)
+ #endif
+ #ifndef S_ISREG
+   #define S_ISREG(mode)  (mode&_S_IFREG)
+ #endif
+ #ifndef S_ISLNK
+   #define S_ISLNK(mode)  (0)
+ #endif
+ #ifndef S_ISSOCK
+   #define S_ISSOCK(mode)  (0)
+ #endif
+ #ifndef S_ISFIFO
+   #define S_ISFIFO(mode)  (0)
+ #endif
+ #ifndef S_ISCHR
+   #define S_ISCHR(mode)  (mode&_S_IFCHR)
+ #endif
+ #ifndef S_ISBLK
+   #define S_ISBLK(mode)  (0)
+ #endif
 #endif
 /*
 ** Convert the inode protection mode to a string.
 */
-#ifdef WIN32
+#ifdef _WIN32
 static const char *mode2string (unsigned short mode) {
 #else
 static const char *mode2string (mode_t mode) {
@@ -381,92 +449,184 @@ static const char *mode2string (mode_t mode) {
 
 
 /*
-** Get file information
+** Set access time and modification values for file
 */
-static int file_info (lua_State *L) {
+static int file_utime (lua_State *L) {
+	const char *file = luaL_checkstring (L, 1);
+	struct utimbuf utb, *buf;
+
+	if (lua_gettop (L) == 1) /* set to current date/time */
+		buf = NULL;
+	else {
+		utb.actime = (time_t)luaL_optnumber (L, 2, 0);
+		utb.modtime = (time_t)luaL_optnumber (L, 3, utb.actime);
+		buf = &utb;
+	}
+	if (utime (file, buf)) {
+		lua_pushnil (L);
+		lua_pushfstring (L, "%s", strerror (errno));
+		return 2;
+	}
+	lua_pushboolean (L, 1);
+	return 1;
+}
+
+
+/* inode protection mode */
+static void push_st_mode (lua_State *L, struct stat *info) {
+	lua_pushstring (L, mode2string (info->st_mode));
+}
+/* device inode resides on */
+static void push_st_dev (lua_State *L, struct stat *info) {
+	lua_pushnumber (L, (lua_Number)info->st_dev);
+}
+/* inode's number */
+static void push_st_ino (lua_State *L, struct stat *info) {
+	lua_pushnumber (L, (lua_Number)info->st_ino);
+}
+/* number of hard links to the file */
+static void push_st_nlink (lua_State *L, struct stat *info) {
+	lua_pushnumber (L, (lua_Number)info->st_nlink);
+}
+/* user-id of owner */
+static void push_st_uid (lua_State *L, struct stat *info) {
+	lua_pushnumber (L, (lua_Number)info->st_uid);
+}
+/* group-id of owner */
+static void push_st_gid (lua_State *L, struct stat *info) {
+	lua_pushnumber (L, (lua_Number)info->st_gid);
+}
+/* device type, for special file inode */
+static void push_st_rdev (lua_State *L, struct stat *info) {
+	lua_pushnumber (L, (lua_Number)info->st_rdev);
+}
+/* time of last access */
+static void push_st_atime (lua_State *L, struct stat *info) {
+	lua_pushnumber (L, info->st_atime);
+}
+/* time of last data modification */
+static void push_st_mtime (lua_State *L, struct stat *info) {
+	lua_pushnumber (L, info->st_mtime);
+}
+/* time of last file status change */
+static void push_st_ctime (lua_State *L, struct stat *info) {
+	lua_pushnumber (L, info->st_ctime);
+}
+/* file size, in bytes */
+static void push_st_size (lua_State *L, struct stat *info) {
+	lua_pushnumber (L, (lua_Number)info->st_size);
+}
+#ifndef _WIN32
+/* blocks allocated for file */
+static void push_st_blocks (lua_State *L, struct stat *info) {
+	lua_pushnumber (L, (lua_Number)info->st_blocks);
+}
+/* optimal file system I/O blocksize */
+static void push_st_blksize (lua_State *L, struct stat *info) {
+	lua_pushnumber (L, (lua_Number)info->st_blksize);
+}
+#endif
+static void push_invalid (lua_State *L, struct stat *info) {
+  luaL_error(L, "invalid attribute name");
+}
+
+typedef void (*_push_function) (lua_State *L, struct stat *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 or symbolic link information
+*/
+static int _file_info_ (lua_State *L, int (*st)(const char*, struct stat*)) {
+	int i;
 	struct stat 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);
-	/* device inode resides on */
-	lua_pushliteral (L, "dev");
-	lua_pushnumber (L, (lua_Number)info.st_dev);
-	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 */
-	lua_pushliteral (L, "blocks");
-	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);
+	if (lua_isstring (L, 2)) {
+		int v;
+		const char *member = lua_tostring (L, 2);
+		if (strcmp (member, "mode") == 0) v = 0;
+#ifndef _WIN32
+		else if (strcmp (member, "blocks")  == 0) v = 11;
+		else if (strcmp (member, "blksize") == 0) v = 12;
 #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);
+}
+
+
+/*
+** Get symbolic link information using lstat.
+*/
+#ifndef _WIN32
+static int link_info (lua_State *L) {
+	return _file_info_ (L, lstat);
+}
+#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 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.0b");
+	lua_pushliteral (L, "LuaFileSystem 1.4.0");
 	lua_settable (L, -3);
 }
 
@@ -478,13 +638,20 @@ static const struct luaL_reg fslib[] = {
 	{"dir", dir_iter_factory},
 	{"lock", file_lock},
 	{"mkdir", make_dir},
+	{"rmdir", remove_dir},
+#ifndef _WIN32
+	{"symlinkattributes", link_info},
+#else
+    {"setmode", lfs_f_setmode},
+#endif
+	{"touch", file_utime},
 	{"unlock", file_unlock},
 	{NULL, NULL},
 };
 
 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.0
+EXPORTS
+luaopen_lfs

src/lfs.h

@@ -1,10 +1,16 @@
-/* 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"
-#else
-#define chdir_error	strerror(errno)
-#endif
-
-int luaopen_lfs (lua_State *L);
+/*
+** LuaFileSystem
+** Copyright Kepler Project 2003 (http://www.keplerproject.org/luafilesystem)
+**
+** $Id: lfs.h,v 1.4 2008/02/11 22:42:21 carregal Exp $
+*/
+
+/* Define 'chdir' for systems that do not implement it */
+#ifdef NO_CHDIR
+#define chdir(p)	(-1)
+#define chdir_error	"Function 'chdir' not provided by system"
+#else
+#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,10 +32,81 @@ 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
-assert (lfs.mkdir (tmp.."/lfs_tmp_dir"), "could not make a new directory")
-assert (os.remove (tmp.."/lfs_tmp_dir"), "could not remove new directory")
-assert (lfs.mkdir (tmp.."/lfs_tmp_dir/lfs_tmp_dir") == false, "could create a directory inside a non-existent one")
--- 
+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)
+end
+local f = io.open(tmpfile, "w")
+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")
+
+if lfs.symlinkattributes 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 mode = lfs.setmode(f, "binary")
+    assert(mode == "text")
+    mode = lfs.setmode(f, "text")
+    assert(mode == "binary")
+    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.0
+VERSION 1.2
 EXPORTS
 luaopen_lfs

vc6/luafilesystem_dll.dsp

@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LUAFILESYSTEM_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../lua/include" /I "../../compat" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LUAFILESYSTEM_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../external-src/lua50/include" /I "../../compat/src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LUAFILESYSTEM_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x416 /d "NDEBUG"
@@ -53,7 +53,11 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 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
-# ADD LINK32 lua50.lib lualib50.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:"../../lua/lib/vc6"
+# 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 luafilesystem-1.2-win32.zip lfs.dll
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "luafilesystem_dll - Win32 Debug"
 
@@ -69,7 +73,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LUAFILESYSTEM_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../lua/include" /I "../../compat" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LUAFILESYSTEM_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../external-src/lua50/include" /I "../../compat/src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LUAFILESYSTEM_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x416 /d "_DEBUG"
@@ -79,7 +83,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 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 /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 lua50d.lib lualib50d.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 /debug /machine:I386 /out:"../bin/vc6/lfsd.dll" /pdbtype:sept /libpath:"../../lua/lib/vc6"
+# 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 /debug /machine:I386 /out:"../bin/vc6/lfsd.dll" /pdbtype:sept /libpath:"../../external-src/lua50/lib/dll"
 
 !ENDIF 
 
@@ -92,15 +96,15 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE="..\..\compat\compat-5.1.c"
+SOURCE="..\..\compat\src\compat-5.1.c"
 # End Source File
 # Begin Source File
 
-SOURCE=..\lfs.c
+SOURCE=..\src\lfs.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\lfs.def
+SOURCE=.\lfs.def
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -108,11 +112,11 @@ SOURCE=..\lfs.def
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE="..\..\compat\compat-5.1.h"
+SOURCE="..\..\compat\src\compat-5.1.h"
 # End Source File
 # Begin Source File
 
-SOURCE=..\lfs.h
+SOURCE=..\src\lfs.h
 # End Source File
 # End Group
 # Begin Group "Resource Files"