Merging the documentation from HEAD

If it is a table, then it is used instead of creating a new one.
If it is a string, then it is used to indicate the attribute which will
be returned (only one parameter is accepted).

Makefile

@@ -1,14 +1,10 @@
-# $Id: Makefile,v 1.19 2005/05/30 17:54:49 uid20006 Exp $
+# $Id: Makefile,v 1.26 2005/06/27 17:06:01 tomas Exp $
 
 T= lfs
+V= 1.2
+CONFIG= ./config
 
-include ./config
+include $(CONFIG)
-
-V= 1.1
-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
@@ -18,7 +14,7 @@ OBJS= src/$T.o $(COMPAT_O)
 lib: src/$(LIBNAME)
 
 src/$(LIBNAME): $(OBJS)
-	$(CC) $(CFLAGS) $(LIBS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS)
+	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS)
 
 $(COMPAT_O): $(COMPAT_DIR)/compat-5.1.c
 	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
@@ -26,16 +22,7 @@ $(COMPAT_O): $(COMPAT_DIR)/compat-5.1.c
 install: src/$(LIBNAME)
 	mkdir -p $(LUA_LIBDIR)
 	cp src/$(LIBNAME) $(LUA_LIBDIR)
-	ln -f -s $(LUA_LIBDIR)/$(LIBNAME) $(LUA_LIBDIR)/$T.so
+	cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
 
 clean:
-	rm -f $L src/$(LIBNAME) $(OBJS)
+	rm -f src/$(LIBNAME) $(OBJS) $(COMPAT_O)
-
-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)

config

@@ -2,21 +2,19 @@
 # System's libraries directory (where binary libraries are installed)
 LUA_LIBDIR= /usr/local/lib/lua/5.0
 # Lua includes directory
-LUA_INC= /usr/local/include/lua5
+LUA_INC= /usr/local/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
 
+LIBNAME= $T.so.$V
 COMPAT_DIR= ../compat/src
 
 # Compilation directives
-# On FreeBSD systems, the following line should be commented
-DLLIB= -ldl
-#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.14 2005/06/24 01:49:16 tomas Exp $

doc/us/examples.html

@@ -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" -->
@@ -42,6 +44,12 @@
 			</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 +92,9 @@ 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">
-	<p><small>
+    <img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p>
-	$Id: examples.html,v 1.3 2005/05/20 18:04:56 uid20002 Exp $
+	<p><small>$Id: examples.html,v 1.5 2006/03/14 14:07:55 carregal Exp $</small></p>
-	</small></p>
 </div> <!-- id="about" -->
 
 </div> <!-- id="container" -->

doc/us/index.html

@@ -6,14 +6,17 @@
     <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" -->
@@ -41,6 +44,12 @@
 			</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" -->
@@ -61,9 +70,9 @@ the underlying directory structure and file attributes.</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.2. It was developed for Lua 5.0.</p>
 
-<p>Version 1.1 follows the
+<p>Version 1.2 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>
@@ -71,31 +80,47 @@ 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> Release 2
-a Windows pre-compiled version of LuaFileSystem can also be found at the same
+a Windows binary version of LuaFileSystem can also be found at the
 LuaForge page.</p>
 
 
 <h2><a name="history"></a>History</h2>
 
+<dl class="history">
+    <dt><strong>Version 1.2</strong> [15/Mar/2006]</dt>
+    <dd>
     <ul>
-    <li>[30/May/2005] Version 1.1 released<br/>
+        <li>added optional argument to
-        added function <code>lfs.touch</code>.
+        <a href="manual.html#attributes"><code>lfs.attributes</code></a></li>
-    </li>
+        <li>added function
-    <li>[21/Jan/2005] Version 1.0 released</li>
+        <a href="manual.html#rmdir"><code>lfs.rmdir</code></a></li>
-    <li>[10/Nov/2004] Version 1.0 beta released</li>
+        <li>bug correction on <code>lfs.dir</code></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 <code>lfs.touch</code>.</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 +129,17 @@ 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">
-	<p><small>
+    <img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p>
-	$Id: index.html,v 1.22 2005/05/30 18:25:15 uid20002 Exp $
+	<p><small>$Id: index.html,v 1.30 2006/03/15 16:44:04 carregal Exp $</small></p>
-	</small></p>
 </div> <!-- id="about" -->
 
 </div> <!-- id="container" -->

doc/us/license.html

@@ -6,14 +6,17 @@
     <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" -->
@@ -41,6 +44,12 @@
 			</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 +84,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; 2004-2006 The 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 +111,9 @@ 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">
-	<p><small>
+    <img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p>
-	$Id: license.html,v 1.7 2005/05/20 18:43:00 uid20006 Exp $
+	<p><small>$Id: license.html,v 1.9 2006/03/14 14:07:55 carregal Exp $</small></p>
-	</small></p>
 </div><!-- id="about" -->
 
 </div><!-- id="container" -->

doc/us/manual.html

@@ -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" -->
@@ -42,6 +42,12 @@
 			</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 +63,47 @@ 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
-files. The distribution provides a <code>Makefile</code> prepared to
-compile the library and install it. The file <code>config</code> should
-be edited to suit the needs of the aimed platform.</p>
-
 <h2><a name="installation"></a>Installation</h2>
 
 <p>LuaFileSystem follows the
-<a href="http://www.keplerproject.org/compat">package model</a>
+<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>
+binary properly.
+The compiled binary should be copied to a directory in your
+<code>LUA_CPATH</code>.</p>
 
-<p>Windows users can use the pre-compiled version of LuaFileSystem
+<p>Windows users can use the binary version of LuaFileSystem
 (<code>lfs.dll</code>) available at
-<a href="http://luaforge.net/projects/luafilesystem/files">LuaForge</a></p>
+<a href="http://luaforge.net/projects/luafilesystem/files">LuaForge</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.0/manual.html#5.7"><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 +121,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>
@@ -141,8 +155,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 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
@@ -152,15 +170,21 @@ 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="touch"></a><strong><code>lfs.touch (filepath [, atime [, mtime]])</code></strong></dt>
     <dd>Set access and modification times of a file. This function is
@@ -169,10 +193,11 @@ binary properly</p>
     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>).
-    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 +205,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 +215,9 @@ 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">
-	<p><small>
+    <img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p>
-	$Id: manual.html,v 1.21 2005/05/24 23:27:34 carregal Exp $
+	<p><small>$Id: manual.html,v 1.30.2.1 2006/03/15 20:30:53 carregal Exp $</small></p>
-	</small></p>
 </div> <!-- id="about" -->
 
 </div> <!-- id="container" -->

src/lfs.c

@@ -1,4 +1,7 @@
 /*
+** LuaFileSystem
+** Copyright Kepler Project 2004-2006 (http://www.keplerproject.org/luafilesystem)
+**
 ** File system manipulation library.
 ** This library offers these functions:
 **   lfs.attributes (filepath [, attributename])
@@ -7,10 +10,11 @@
 **   lfs.dir (path)
 **   lfs.lock (fh, mode)
 **   lfs.mkdir (path)
+**   lfs.rmdir (path)
 **   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.32 2006/03/14 13:39:38 tomas Exp $
 */
 
 #include <errno.h>
@@ -54,12 +58,15 @@
 
 #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;
 
 
 /*
@@ -175,7 +182,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 +203,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 +221,45 @@ 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;
+#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 +270,27 @@ 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
 }
 
@@ -292,15 +299,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 +320,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,10 +430,92 @@ static int file_utime (lua_State *L) {
 }
 
 
+/* 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
+
+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, NULL }
+};
+
 /*
 ** Get file information
 */
 static int file_info (lua_State *L) {
+	int i;
 	struct stat info;
 	const char *file = luaL_checkstring (L, 1);
 
@@ -433,62 +524,29 @@ static int file_info (lua_State *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, "blksize") == 0) v = 12;
-	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);
 #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;
 }
 
@@ -498,16 +556,13 @@ static int file_info (lua_State *L) {
 */
 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-2006 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.2");
 	lua_settable (L, -3);
 }
 
@@ -519,6 +574,7 @@ static const struct luaL_reg fslib[] = {
 	{"dir", dir_iter_factory},
 	{"lock", file_lock},
 	{"mkdir", make_dir},
+	{"rmdir", remove_dir},
 	{"touch", file_utime},
 	{"unlock", file_unlock},
 	{NULL, NULL},

src/lfs.h

@@ -1,5 +1,11 @@
+/*
+** LuaFileSystem
+** Copyright Kepler Project 2004-2006 (http://www.keplerproject.org/luafilesystem)
+**
+** $Id: lfs.h,v 1.3 2006/03/10 23:37:32 carregal 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"

tests/test.lua

@@ -1,4 +1,4 @@
-#!/usr/local/bin/lua
+#!/usr/local/bin/lua50
 
 local tmp = "/tmp"
 local sep = "/"
@@ -9,7 +9,7 @@ require"lfs"
 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 +31,50 @@ 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 = tmp..sep.."lfs_tmp_dir"
+local tmpfile = tmpdir..sep.."tmp_file"
 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
+end
+local f = io.open(tmpfile, "w")
+f:close()
+
 -- Change access time
-	assert (lfs.touch (tmpdir, 11))
+assert (lfs.touch (tmpfile, 86401))
-	local new_att = assert (lfs.attributes (tmpdir))
+local new_att = assert (lfs.attributes (tmpfile))
-	assert (new_att.access == 11, "could not set access time")
+assert (new_att.access == 86401, "could not set access time")
-	assert (new_att.modification == 11, "could not set modification time")
+assert (new_att.modification == 86401, "could not set modification time")
+
 -- Change access and modification time
-	assert (lfs.touch (tmpdir, 33, 22))
+assert (lfs.touch (tmpfile, 86403, 86402))
-	local new_att = assert (lfs.attributes (tmpdir))
+local new_att = assert (lfs.attributes (tmpfile))
-	assert (new_att.access == 33, "could not set access time")
+assert (new_att.access == 86403, "could not set access time")
-	assert (new_att.modification == 22, "could not set modification time")
+assert (new_att.modification == 86402, "could not set modification time")
+
 -- Restore access time to current value
-	assert (lfs.touch (tmpdir))
+assert (lfs.touch (tmpfile))
-	new_att = assert (lfs.attributes (tmpdir))
+new_att = assert (lfs.attributes (tmpfile))
 assert (new_att.access == attrib.access)
 assert (new_att.modification == attrib.modification)
-end
+
-assert (os.remove (tmpdir), "could not remove new directory")
+-- Remove new file and directory
-assert (lfs.mkdir (tmpdir.."/lfs_tmp_dir") == false, "could create a directory inside a non-existent one")
+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"