Merge branch 'master' into 2.0

* Dynamically size getcwd() buffer in get_dir function

This should fix issue 42.

* Fixup: Properly respect NO_GETCWD

* Fixup: Get rid of getcwd_error, handle NO_GETCWD in a single place

.gitignore

@@ -0,0 +1,2 @@
+*.so
+

.travis.yml

@@ -1,31 +1,33 @@
 language: c
 
-env:
+sudo: false
-  global:
-    - LUAROCKS=2.2.0-rc1
-  matrix:
-    - LUA=lua5.1
-    - LUA=lua5.2
-    - LUA=lua5.3
-    - LUA=luajit
 
-branches:
+env:
-  only:
+  - LUA="lua 5.1"
-    - master
+  - LUA="lua 5.2"
+  - LUA="lua 5.3"
+  - LUA="luajit 2.0"
 
 before_install:
-  - bash .travis/setup_lua.sh
+  - pip install --user cpp-coveralls hererocks
-  - sudo pip install cpp-coveralls
+  - hererocks env --$LUA --luarocks latest
+  - export PATH="$PWD/env/bin:$PATH"
+  - luarocks install Lua-cURL --server=https://luarocks.org/dev
+  - luarocks install lua-path 
+  - luarocks install lua-cjson 
+  - luarocks install luacov
+  # install luacov-coveralls, but avoids installing luafilesystem
+  - luarocks install luacov-coveralls --server=https://luarocks.org/dev --deps-mode=none
 
 install:
-  - sudo luarocks make rockspecs/luafilesystem-cvs-3.rockspec CFLAGS="-O2 -fPIC -ftest-coverage -fprofile-arcs" LIBFLAG="-shared --coverage"
+  - luarocks make rockspecs/luafilesystem-cvs-3.rockspec CFLAGS="-O2 -fPIC -ftest-coverage -fprofile-arcs" LIBFLAG="-shared --coverage"
 
-script: 
+script:
-  - cd tests
+  - lua -lluacov tests/test.lua
-  - sudo lua test.lua
 
 after_success:
-  - coveralls -b .. -r .. -E usr
+  - coveralls -b . -i src --dump c.report.json
+  - luacov-coveralls -j c.report.json -v
 
 notifications:
   email:

.travis/platform.sh

@@ -1,15 +0,0 @@
-if [ -z "$PLATFORM" ]; then
-  PLATFORM=$TRAVIS_OS_NAME;
-fi
-
-if [ "$PLATFORM" == "osx" ]; then
-  PLATFORM="macosx";
-fi
-
-if [ -z "$PLATFORM" ]; then
-  if [ "$(uname)" == "Linux" ]; then
-    PLATFORM="linux";
-  else
-    PLATFORM="macosx";
-  fi;
-fi

.travis/setup_lua.sh

@@ -1,101 +0,0 @@
-#! /bin/bash
-
-# A script for setting up environment for travis-ci testing.
-# Sets up Lua and Luarocks.
-# LUA must be "lua5.1", "lua5.2" or "luajit".
-# luajit2.0 - master v2.0
-# luajit2.1 - master v2.1
-
-LUAJIT_BASE="LuaJIT-2.0.3"
-
-source .travis/platform.sh
-
-LUAJIT="no"
-
-if [ "$PLATFORM" == "macosx" ]; then
-  if [ "$LUA" == "luajit" ]; then
-    LUAJIT="yes";
-  fi
-  if [ "$LUA" == "luajit2.0" ]; then
-    LUAJIT="yes";
-  fi
-  if [ "$LUA" == "luajit2.1" ]; then
-    LUAJIT="yes";
-  fi;
-elif [ "$(expr substr $LUA 1 6)" == "luajit" ]; then
-  LUAJIT="yes";
-fi
-
-if [ "$LUAJIT" == "yes" ]; then
-
-  if [ "$LUA" == "luajit" ]; then
-    curl http://luajit.org/download/$LUAJIT_BASE.tar.gz | tar xz;
-  else
-    git clone http://luajit.org/git/luajit-2.0.git $LUAJIT_BASE;
-  fi
-
-  cd $LUAJIT_BASE
-
-  if [ "$LUA" == "luajit2.1" ]; then
-    git checkout v2.1;
-  fi
-
-  make && sudo make install
-
-  if [ "$LUA" == "luajit2.1" ]; then
-    sudo ln -s /usr/local/bin/luajit-2.1.0-alpha /usr/local/bin/luajit
-    sudo ln -s /usr/local/bin/luajit /usr/local/bin/lua;
-  else
-    sudo ln -s /usr/local/bin/luajit /usr/local/bin/lua;
-  fi;
-
-else
-  if [ "$LUA" == "lua5.1" ]; then
-    curl http://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz
-    cd lua-5.1.5;
-  elif [ "$LUA" == "lua5.2" ]; then
-    curl http://www.lua.org/ftp/lua-5.2.3.tar.gz | tar xz
-    cd lua-5.2.3;
-  elif [ "$LUA" == "lua5.3" ]; then
-    curl http://www.lua.org/work/lua-5.3.0-beta.tar.gz | tar xz
-    cd lua-5.3.0-beta;
-  fi
-  sudo make $PLATFORM install;
-fi
-
-cd $TRAVIS_BUILD_DIR;
-
-LUAROCKS_BASE=luarocks-$LUAROCKS
-
-# curl http://luarocks.org/releases/$LUAROCKS_BASE.tar.gz | tar xz
-
-git clone https://github.com/keplerproject/luarocks.git $LUAROCKS_BASE
-cd $LUAROCKS_BASE
-
-git checkout v$LUAROCKS
-
-if [ "$LUA" == "luajit" ]; then
-  ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.0;
-elif [ "$LUA" == "luajit2.0" ]; then
-  ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.0;
-elif [ "$LUA" == "luajit2.1" ]; then
-  ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.1;
-else
-  ./configure;
-fi
-
-make build && sudo make install
-
-cd $TRAVIS_BUILD_DIR
-
-rm -rf $LUAROCKS_BASE
-
-if [ "$LUAJIT" == "yes" ]; then
-  rm -rf $LUAJIT_BASE;
-elif [ "$LUA" == "lua5.1" ]; then
-  rm -rf lua-5.1.5;
-elif [ "$LUA" == "lua5.2" ]; then
-  rm -rf lua-5.2.3;
-elif [ "$LUA" == "lua5.3" ]; then
-  rm -rf lua-5.3.0-beta;
-fi

Makefile

@@ -12,7 +12,7 @@ OBJS= src/$T.o
 lib: src/lfs.so
 
 src/lfs.so: $(OBJS)
-	MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/lfs.so $(OBJS)
+	MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(LIB_OPTION) -o src/lfs.so $(OBJS)
 
 test: lib
 	LUA_CPATH=./src/?.so lua tests/test.lua

README

@@ -1,82 +0,0 @@
-LuaFileSystem - File System Library for Lua
-Copyright 2003 Kepler Project
-http://www.keplerproject.org/luafilesystem
-
-Description
------------
-LuaFileSystem is a Lua library developed to complement the set of functions
-related to file systems offered by the standard Lua distribution.
-
-LuaFileSystem offers a portable way to access the underlying directory structure and file attributes.
-LuaFileSystem is free software and uses the same license as Lua 5.1
-
-LuaRocks Installation
----------------------
-luarocks install luafilesystem
-
-
-Documentation
--------------
-Please check the documentation at doc/us/ for more information.
-
-History
--------
-
-Version 1.6.3 [15/Jan/2012]
-	* Lua 5.3 compatibility
-	* Assorted bugfixes
-
-Version 1.6.2 [??/Oct/2012]
-	* Full Lua 5.2 compatibility (with Lua 5.1 fallbacks)
-
-Version 1.6.1 [01/Oct/2012]
-	* fix build for Lua 5.2
-
-Version 1.6.0 [26/Sep/2012]
-        * getcwd fix for Android
-        * support for Lua 5.2
-        * add lfs.link
-        * other bug fixes
-
-Version 1.5.0 [20/Oct/2009]
-	* added explicit next and close methods to second return value of lfs.dir (the directory object), for explicit iteration or explicit closing.
-	* added directory locking via lfs.lock_dir function (see the manual).
-
-Version 1.4.2 [03/Feb/2009]
-
-        * fixed bug [#13198] lfs.attributes(filename, 'size') overflow on files > 2 Gb again (bug report and patch by KUBO Takehiro).
-        * fixed bug [#39794] Compile error on Solaris 10 (bug report and patch by Aaron B).
-        * fixed compilation problems with Borland C.
-
-Version 1.4.1 [07/May/2008]
-
-        * documentation review
-        * fixed Windows compilation issues
-        * fixed bug in the Windows tests (patch by Shmuel Zeigerman)
-        * fixed bug [#2185] lfs.attributes(filename, 'size') overflow on files > 2 Gb
-
-Version 1.4.0 [13/Feb/2008]
-
-        * added function lfs.setmode (works only in Windows systems).
-        * lfs.attributes raises an error if attribute does not exist
-
-Version 1.3.0 [26/Oct/2007]
-
-        * added function lfs.symlinkattributes (works only in non Windows systems).
-
-Version 1.2.1 [08/May/2007]
-
-        * compatible only with Lua 5.1 (Lua 5.0 support was dropped)
-
-Version 1.2 [15/Mar/2006]
-
-        * added optional argument to lfs.attributes
-        * added function lfs.rmdir
-        * bug correction on lfs.dir
-
-Version 1.1 [30/May/2005]
-
-        * added function lfs.touch.
-
-Version 1.0 [21/Jan/2005]
-Version 1.0 Beta [10/Nov/2004]

README.md

@@ -0,0 +1,27 @@
+[![Licence](http://img.shields.io/badge/Licence-MIT-brightgreen.svg)](LICENCE.txt)
+[![Build Status](https://travis-ci.org/keplerproject/luafilesystem.svg?branch=master)](https://travis-ci.org/keplerproject/luafilesystem)
+[![Build status](https://ci.appveyor.com/api/projects/status/y04s4ms7u16trw8e?svg=true)](https://ci.appveyor.com/project/ignacio/luafilesystem)
+[![Coverage Status](https://coveralls.io/repos/keplerproject/luafilesystem/badge.png)](https://coveralls.io/r/keplerproject/luafilesystem)
+
+# LuaFileSystem - File System Library for Lua
+Copyright 2003-2016 Kepler Project
+
+http://keplerproject.github.io/luafilesystem
+
+# Description
+
+LuaFileSystem is a Lua library developed to complement the set of functions
+related to file systems offered by the standard Lua distribution.
+
+LuaFileSystem offers a portable way to access the underlying directory structure and file attributes.
+LuaFileSystem is free software and uses the same license as Lua 5.1
+
+# LuaRocks Installation
+
+```
+luarocks install luafilesystem
+```
+
+# Documentation
+
+Please check the documentation at doc/us/ for more information.

appveyor.yml

@@ -0,0 +1,42 @@
+version: 0.0.1.{build}-test
+
+# Use default image unless needed
+#os:
+#- Windows Server 2012 R2
+
+shallow_clone: true
+
+environment:
+  matrix:
+  - LUA: "lua 5.1"
+  - LUA: "lua 5.2 --compat none"
+  - LUA: "lua 5.3 --compat none"
+  - LUA: "luajit 2.0"
+  - LUA: "luajit 2.1"
+
+# Abuse this section so we can have a matrix with different Compiler versions
+configuration:
+  - mingw
+  - vs_32
+  - vs_64
+
+install:
+  - set PATH=%CD%\env\bin;C:\Python27\Scripts;C:\MinGW\bin;%PATH%
+  - pip install hererocks
+  - hererocks env --%LUA% --target %configuration% --luarocks latest
+
+before_build:
+# @todo
+- echo "Installing external deps"
+
+build_script:
+- luarocks make rockspecs/luafilesystem-cvs-3.rockspec
+
+before_test:
+
+test_script:
+- echo "Testing..."
+- lua tests/test.lua
+
+after_test:
+# @todo

doc/us/examples.html

@@ -13,7 +13,7 @@
 
 <div id="product">
 	<div id="product_logo">
-        <a href="http://www.keplerproject.org">
+        <a href="http://keplerproject.github.io/luafilesystem">
 		<img alt="LuaFileSystem" src="luafilesystem.png"/>
 	    </a>
     </div>
@@ -33,7 +33,6 @@
 				<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>
@@ -94,7 +93,6 @@ attrdir (".")
 
 <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" -->

doc/us/index.html

@@ -13,7 +13,7 @@
 
 <div id="product">
 	<div id="product_logo">
-        <a href="http://www.keplerproject.org">
+        <a href="http://keplerproject.github.io/luafilesystem">
 		<img alt="LuaFileSystem" src="luafilesystem.png"/>
 	    </a>
     </div>
@@ -33,7 +33,6 @@
 				<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>
@@ -67,7 +66,7 @@ systems offered by the standard Lua distribution.</p>
 the underlying directory structure and file attributes.</p>
 
 <p>LuaFileSystem is free software and uses the same
-<a href="license.html">license</a> as Lua 5.1.</p>
+<a href="license.html">license</a> as Lua 5.x (MIT).</p>
 
 <h2><a name="status"></a>Status</h2>
 
@@ -115,9 +114,9 @@ page.</p>
 	<dt><strong>Version 1.4.2</strong> [03/Feb/2009]</dt>
 	<dd>
 		<ul>
-			<li>fixed bug [<a href="http://luaforge.net/tracker/?func=detail&amp;group_id=66&amp;aid=13198&amp;atid=356">#13198</a>]
+			<li>fixed bug
-				lfs.attributes(filename, 'size') overflow on files > 2 Gb again  (bug report and patch by KUBO Takehiro).</li>
+				<code>lfs.attributes(filename, 'size')</code> overflow on files > 2 Gb again  (bug report and patch by KUBO Takehiro).</li>
-			<li>fixed bug [<a href="http://luaforge.net/tracker/?group_id=66&amp;atid=356&amp;func=detail&amp;aid=39794">#39794</a>]
+			<li>fixed bug
 				Compile error on Solaris 10 (bug report and patch by Aaron B).</li>
 			<li>fixed compilation problems with Borland C.</li>
 		</ul>
@@ -129,7 +128,7 @@ page.</p>
 	<li>documentation review</li>
 	<li>fixed Windows compilation issues</li>
 	<li>fixed bug in the Windows tests (patch by Shmuel Zeigerman)</li>
-	<li>fixed bug [<a href="http://luaforge.net/tracker/?func=detail&amp;group_id=66&amp;aid=2185&amp;atid=356">#2185</a>]
+	<li>fixed bug
 		<code>lfs.attributes(filename, 'size')</code> overflow on files > 2 Gb
 	</li>
 	</ul>
@@ -191,25 +190,15 @@ page.</p>
 
 <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="https://github.com/keplerproject">Kepler Project</a>,
 which holds its copyright. LuaFileSystem is currently maintained by F&aacute;bio Mascarenhas.</p>
 
-<h2><a name="contact"></a>Contact us</h2>
-
-<p>For more information please
-<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">Valid XHTML 1.0!</a></p>
-	<p><small>$Id: index.html,v 1.44 2009/02/04 21:21:33 carregal Exp $</small></p>
 </div> <!-- id="about" -->
 
 </div> <!-- id="container" -->

doc/us/license.html

@@ -13,7 +13,7 @@
 
 <div id="product">
 	<div id="product_logo">
-        <a href="http://www.keplerproject.org">
+        <a href="http://keplerproject.github.io/luafilesystem">
 		<img alt="LuaFileSystem" src="luafilesystem.png"/>
 	    </a>
     </div>
@@ -33,7 +33,6 @@
 				<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>
@@ -47,7 +46,7 @@
 		<li><a href="examples.html">Examples</a></li>
         <li><a href="https://github.com/keplerproject/luafilesystem">Project</a>
             <ul>
-                <li><a href="https://github.com/keplerproject/luafilesystem/issues/">Bug Tracker</a></li>
+                <li><a href="https://github.com/keplerproject/luafilesystem/issues">Bug Tracker</a></li>
                 <li><a href="https://github.com/keplerproject/luafilesystem">Git</a></li>
             </ul>
         </li>
@@ -69,7 +68,7 @@ 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>
+<a href="https://github.com/keplerproject">Kepler Project</a>
 keep its copyright.
 The legal details are below. 
 </p>
@@ -113,7 +112,6 @@ SOFTWARE.</p>
 
 <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" -->

doc/us/manual.html

@@ -13,7 +13,9 @@
 
 <div id="product">
 	<div id="product_logo">
-        <a href="http://www.keplerproject.org"><img alt="LuaFileSystem" src="luafilesystem.png"/></a>
+        <a href="http://keplerproject.github.io/luafilesystem">
+        <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>
@@ -31,7 +33,6 @@
 				<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>
@@ -101,14 +102,15 @@ LuaFileSystem offers the following functions:
 </p>
 
 <dl class="reference">
-    <dt><a name="attributes"></a><strong><code>lfs.attributes (filepath [, aname])</code></strong></dt>
+    <dt><a name="attributes"></a><strong><code>lfs.attributes (filepath [, aname | atable])</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
+    <code>filepath</code> (or <code>nil</code> followed by an error message and a system-dependent error code
     in case of error).
-    If the second optional argument is given, then only the value of the
+    If the second optional argument is given and is a string, 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
+    <code>lfs.attributes(filepath)[aname]</code>, but the table is not created
     and only one attribute is retrieved from the O.S.).
+    if a table is passed as the second argument, it is filled with attributes and returned instead of a new table.
     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
@@ -152,6 +154,9 @@ LuaFileSystem offers the following functions:
         <dt><strong><code>size</code></strong></dt>
 		<dd>file size, in bytes</dd>
 
+        <dt><strong><code>permissions</code></strong></dt>
+		<dd>file permissions string</dd>
+
         <dt><strong><code>blocks</code></strong></dt>
 		<dd>block allocated for file; (Unix only)</dd>
         
@@ -172,7 +177,7 @@ LuaFileSystem offers the following functions:
     Returns <code>true</code> in case of success or <code>nil</code> plus an
     error string.</dd>
 
-    <dt><a name="chdir"></a><strong><code>lfs.lock_dir(path, [seconds_stale])</code></strong></dt>
+    <dt><a name="lock_dir"></a><strong><code>lfs.lock_dir(path, [seconds_stale])</code></strong></dt>
     <dd>Creates a lockfile (called lockfile.lfs) in <code>path</code> if it does not
   exist and returns the lock. If the lock already exists checks if
   it's stale, using the second parameter (default for the second
@@ -182,7 +187,7 @@ LuaFileSystem offers the following functions:
   particular, if the lock exists and is not stale it returns the
   "File exists" message.</dd>
         
-    <dt><a name="getcwd"></a><strong><code>lfs.currentdir ()</code></strong></dt>
+    <dt><a name="currentdir"></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>
     
@@ -217,14 +222,14 @@ LuaFileSystem offers the following functions:
     <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;
+    Returns <code>true</code> in case of success or <code>nil</code>, an error message and
-    in case of error, it returns <code>nil</code> plus an error string.
+    a system-dependent error code in case of error.
     </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;
+    Returns <code>true</code> in case of success or <code>nil</code>, an error message and
-    in case of error, it returns <code>nil</code> plus an error string.</dd>
+    a system-dependent error code in case of error.
 
     <dt><a name="setmode"></a><strong><code>lfs.setmode (file, mode)</code></strong></dt>
     <dd>Sets the writing mode for a file. The mode string can be either <code>"binary"</code> or <code>"text"</code>.
@@ -237,6 +242,8 @@ LuaFileSystem offers the following functions:
     <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).
+    It also adds a <strong><code>target</code></strong> field, containing
+    the file name that the symlink points to.
     On Windows this function does not yet support links, and is identical to
     <code>lfs.attributes</code>.
     </dd>
@@ -250,8 +257,8 @@ LuaFileSystem offers the following functions:
     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;
+    Returns <code>true</code> in case of success or <code>nil</code>, an error message and
-    in case of error, it returns <code>nil</code> plus an error string.
+    a system-dependent error code in case of error.
     </dd>
     
     <dt><a name="unlock"></a><strong><code>lfs.unlock (filehandle[, start[, length]])</code></strong></dt>
@@ -271,7 +278,6 @@ LuaFileSystem offers the following functions:
 
 <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.45 2009/06/03 20:53:55 mascarenhas Exp $</small></p>
 </div> <!-- id="about" -->
 
 </div> <!-- id="container" -->

src/lfs.c

@@ -1,23 +1,22 @@
 /*
 ** LuaFileSystem
-** Copyright Kepler Project 2003 (http://www.keplerproject.org/luafilesystem)
+** Copyright Kepler Project 2003 - 2016 (http://keplerproject.github.io/luafilesystem)
 **
 ** File system manipulation library.
 ** This library offers these functions:
-**   lfs.attributes (filepath [, attributename])
+**   lfs.attributes (filepath [, attributename | attributetable])
 **   lfs.chdir (path)
 **   lfs.currentdir ()
 **   lfs.dir (path)
+**   lfs.link (old, new[, symlink])
 **   lfs.lock (fh, mode)
 **   lfs.lock_dir (path)
 **   lfs.mkdir (path)
 **   lfs.rmdir (path)
 **   lfs.setmode (filepath, mode)
-**   lfs.symlinkattributes (filepath [, attributename]) -- thanks to Sam Roberts
+**   lfs.symlinkattributes (filepath [, attributename])
 **   lfs.touch (filepath [, atime [, mtime]])
 **   lfs.unlock (fh)
-**
-** $Id: lfs.c,v 1.61 2009/07/04 02:10:16 mascarenhas Exp $
 */
 
 #ifndef LFS_DO_NOT_USE_LARGE_FILE
@@ -42,22 +41,26 @@
 #include <sys/stat.h>
 
 #ifdef _WIN32
-#include <direct.h>
+  #include <direct.h>
-#include <windows.h>
+  #include <windows.h>
-#include <io.h>
+  #include <io.h>
-#include <sys/locking.h>
+  #include <sys/locking.h>
-#ifdef __BORLANDC__
+  #ifdef __BORLANDC__
- #include <utime.h>
+    #include <utime.h>
+  #else
+    #include <sys/utime.h>
+  #endif
+  #include <fcntl.h>
+  /* MAX_PATH seems to be 260. Seems kind of small. Is there a better one? */
+  #define LFS_MAXPATHLEN MAX_PATH
 #else
- #include <sys/utime.h>
+  #include <unistd.h>
-#endif
+  #include <dirent.h>
-#include <fcntl.h>
+  #include <fcntl.h>
-#else
+  #include <sys/types.h>
-#include <unistd.h>
+  #include <utime.h>
-#include <dirent.h>
+  #include <sys/param.h> /* for MAXPATHLEN */
-#include <fcntl.h>
+  #define LFS_MAXPATHLEN MAXPATHLEN
-#include <sys/types.h>
-#include <utime.h>
 #endif
 
 #include <lua.h>
@@ -67,7 +70,6 @@
 #include "lfs.h"
 
 #define LFS_VERSION "1.6.3"
-#define LFS_LIBNAME "lfs"
 
 #if LUA_VERSION_NUM >= 503 /* Lua 5.3 */
 
@@ -86,22 +88,6 @@
 #define strerror(_)     "System unable to describe the error"
 #endif
 
-/* Define 'getcwd' for systems that do not implement it */
-#ifdef NO_GETCWD
-#define getcwd(p,s)     NULL
-#define getcwd_error    "Function 'getcwd' not provided by system"
-#else
-#define getcwd_error    strerror(errno)
-  #ifdef _WIN32
-	 /* MAX_PATH seems to be 260. Seems kind of small. Is there a better one? */
-    #define LFS_MAXPATHLEN MAX_PATH
-  #else
-	/* For MAXPATHLEN: */
-    #include <sys/param.h>
-    #define LFS_MAXPATHLEN MAXPATHLEN
-  #endif
-#endif
-
 #define DIR_METATABLE "directory metatable"
 typedef struct dir_data {
         int  closed;
@@ -117,10 +103,10 @@ typedef struct dir_data {
 
 #ifdef _WIN32
  #ifdef __BORLANDC__
-  #define lfs_setmode(L,file,m)   ((void)L, setmode(_fileno(file), m))
+  #define lfs_setmode(file, m)   (setmode(_fileno(file), m))
   #define STAT_STRUCT struct stati64
  #else
-  #define lfs_setmode(L,file,m)   ((void)L, _setmode(_fileno(file), m))
+  #define lfs_setmode(file, m)   (_setmode(_fileno(file), m))
   #define STAT_STRUCT struct _stati64
  #endif
 #define STAT_FUNC _stati64
@@ -128,12 +114,19 @@ typedef struct dir_data {
 #else
 #define _O_TEXT               0
 #define _O_BINARY             0
-#define lfs_setmode(L,file,m)   ((void)L, (void)file, (void)m, 0)
+#define lfs_setmode(file, m)   ((void)file, (void)m, 0)
 #define STAT_STRUCT struct stat
 #define STAT_FUNC stat
 #define LSTAT_FUNC lstat
 #endif
 
+#ifdef _WIN32
+  #define lfs_mkdir _mkdir
+#else
+  #define lfs_mkdir(path) (mkdir((path), \
+    S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IXOTH))
+#endif
+
 /*
 ** Utility functions
 */
@@ -148,12 +141,13 @@ static int pusherror(lua_State *L, const char *info)
         return 3;
 }
 
-static int pushresult(lua_State *L, int i, const char *info)
+static int pushresult(lua_State *L, int res, const char *info) {
-{
+  if (res == -1) {
-        if (i==-1)
+    return pusherror(L, info);
-                return pusherror(L, info);
+  } else {
-        lua_pushinteger(L, i);
+    lua_pushboolean(L, 1);
-        return 1;
+    return 1;
+  }
 }
 
 
@@ -179,33 +173,58 @@ static int change_dir (lua_State *L) {
 **  and a string describing the error
 */
 static int get_dir (lua_State *L) {
-  char *path;
+#ifdef NO_GETCWD
-  /* Passing (NULL, 0) is not guaranteed to work. Use a temp buffer and size instead. */
-  char buf[LFS_MAXPATHLEN];
-  if ((path = getcwd(buf, LFS_MAXPATHLEN)) == NULL) {
     lua_pushnil(L);
-    lua_pushstring(L, getcwd_error);
+    lua_pushstring(L, "Function 'getcwd' not provided by system");
     return 2;
-  }
+#else
-  else {
+    char *path = NULL;
-    lua_pushstring(L, path);
+    /* Passing (NULL, 0) is not guaranteed to work. Use a temp buffer and size instead. */
-    return 1;
+    size_t size = LFS_MAXPATHLEN; /* initial buffer size */
-  }
+    int result;
+    while (1) {
+        path = realloc(path, size);
+        if (!path) /* failed to allocate */
+            return pusherror(L, "get_dir realloc() failed");
+        if (getcwd(path, size) != NULL) {
+            /* success, push the path to the Lua stack */
+            lua_pushstring(L, path);
+            result = 1;
+            break;
+        }
+        if (errno != ERANGE) { /* unexpected error */
+            result = pusherror(L, "get_dir getcwd() failed");
+            break;
+        }
+        /* ERANGE = insufficient buffer capacity, double size and retry */
+        size *= 2;
+    }
+    free(path);
+    return result;
+#endif
 }
 
 /*
 ** Check if the given element on the stack is a file and returns it.
 */
 static FILE *check_file (lua_State *L, int idx, const char *funcname) {
+#if LUA_VERSION_NUM == 501
         FILE **fh = (FILE **)luaL_checkudata (L, idx, "FILE*");
-        if (fh == NULL) {
+        if (*fh == NULL) {
-                luaL_error (L, "%s: not a file", funcname);
-                return 0;
-        } else if (*fh == NULL) {
                 luaL_error (L, "%s: closed file", funcname);
                 return 0;
         } else
                 return *fh;
+#elif LUA_VERSION_NUM >= 502 && LUA_VERSION_NUM <= 503
+        luaL_Stream *fh = (luaL_Stream *)luaL_checkudata (L, idx, "FILE*");
+        if (fh->closef == 0 || fh->f == NULL) {
+                luaL_error (L, "%s: closed file", funcname);
+                return 0;
+        } else
+                return fh->f;
+#else
+#error unsupported Lua version
+#endif
 }
 
 
@@ -292,7 +311,7 @@ static int lfs_lock_dir(lua_State *L) {
   return 1;
 }
 static int lfs_unlock_dir(lua_State *L) {
-  lfs_Lock *lock = luaL_checkudata(L, 1, LOCK_METATABLE);
+  lfs_Lock *lock = (lfs_Lock *)luaL_checkudata(L, 1, LOCK_METATABLE);
   if(lock->fd != INVALID_HANDLE_VALUE) {    
     CloseHandle(lock->fd);
     lock->fd=INVALID_HANDLE_VALUE;
@@ -325,7 +344,7 @@ static int lfs_lock_dir(lua_State *L) {
   return 1;
 }
 static int lfs_unlock_dir(lua_State *L) {
-  lfs_Lock *lock = luaL_checkudata(L, 1, LOCK_METATABLE);
+  lfs_Lock *lock = (lfs_Lock *)luaL_checkudata(L, 1, LOCK_METATABLE);
   if(lock->ln) {
     unlink(lock->ln);
     free(lock->ln);
@@ -339,25 +358,20 @@ static int lfs_g_setmode (lua_State *L, FILE *f, int arg) {
   static const int mode[] = {_O_BINARY, _O_TEXT};
   static const char *const modenames[] = {"binary", "text", NULL};
   int op = luaL_checkoption(L, arg, NULL, modenames);
-  int res = lfs_setmode(L, f, mode[op]);
+  int res = lfs_setmode(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;
+        return 2;
       }
     }
     lua_pushnil(L);
-  exit:
     return 2;
   } else {
-    int en = errno;
+    return pusherror(L, NULL);
-    lua_pushnil(L);
-    lua_pushfstring(L, "%s", strerror(en));
-    lua_pushinteger(L, en);
-    return 3;
   }
 }
 
@@ -415,15 +429,14 @@ static int file_unlock (lua_State *L) {
 ** @param #2 Name of link.
 ** @param #3 True if link is symbolic (optional).
 */
-static int make_link(lua_State *L)
+static int make_link (lua_State *L) {
-{
 #ifndef _WIN32
-        const char *oldpath = luaL_checkstring(L, 1);
+  const char *oldpath = luaL_checkstring(L, 1);
-        const char *newpath = luaL_checkstring(L, 2);
+  const char *newpath = luaL_checkstring(L, 2);
-        return pushresult(L,
+  return pushresult(L, (lua_toboolean(L, 3) ? symlink : link)(oldpath, newpath), NULL);
-                (lua_toboolean(L,3) ? symlink : link)(oldpath, newpath), NULL);
 #else
-        return pusherror(L, "make_link is not supported on Windows");
+  errno = ENOSYS; /* = "Function not implemented" */
+  return pushresult(L, -1, "make_link is not supported on Windows");
 #endif
 }
 
@@ -433,21 +446,8 @@ static int make_link(lua_State *L)
 ** @param #1 Directory path.
 */
 static int make_dir (lua_State *L) {
-        const char *path = luaL_checkstring (L, 1);
+  const char *path = luaL_checkstring(L, 1);
-        int fail;
+  return pushresult(L, lfs_mkdir(path), NULL);
-#ifdef _WIN32
-        fail = _mkdir (path);
-#else
-        fail =  mkdir (path, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP |
-                             S_IWGRP | S_IXGRP | S_IROTH | S_IXOTH );
-#endif
-        if (fail) {
-                lua_pushnil (L);
-        lua_pushfstring (L, "%s", strerror(errno));
-                return 2;
-        }
-        lua_pushboolean (L, 1);
-        return 1;
 }
 
 
@@ -456,18 +456,8 @@ static int make_dir (lua_State *L) {
 ** @param #1 Directory path.
 */
 static int remove_dir (lua_State *L) {
-        const char *path = luaL_checkstring (L, 1);
+  const char *path = luaL_checkstring(L, 1);
-        int fail;
+  return pushresult(L, rmdir(path), NULL);
-
-        fail = rmdir (path);
-
-        if (fail) {
-                lua_pushnil (L);
-                lua_pushfstring (L, "%s", strerror(errno));
-                return 2;
-        }
-        lua_pushboolean (L, 1);
-        return 1;
 }
 
 
@@ -654,26 +644,24 @@ static const char *mode2string (mode_t mode) {
 
 
 /*
-** Set access time and modification values for file
+** Set access time and modification values for a file.
+** @param #1 File path.
+** @param #2 Access time in seconds, current time is used if missing.
+** @param #3 Modification time in seconds, access time is used if missing.
 */
 static int file_utime (lua_State *L) {
-        const char *file = luaL_checkstring (L, 1);
+  const char *file = luaL_checkstring(L, 1);
-        struct utimbuf utb, *buf;
+  struct utimbuf utb, *buf;
 
-        if (lua_gettop (L) == 1) /* set to current date/time */
+  if (lua_gettop (L) == 1) /* set to current date/time */
-                buf = NULL;
+    buf = NULL;
-        else {
+  else {
-                utb.actime = (time_t)luaL_optnumber (L, 2, 0);
+    utb.actime = (time_t) luaL_optnumber(L, 2, 0);
-                utb.modtime = (time_t) luaL_optinteger (L, 3, utb.actime);
+    utb.modtime = (time_t) luaL_optinteger(L, 3, utb.actime);
-                buf = &utb;
+    buf = &utb;
-        }
+  }
-        if (utime (file, buf)) {
+
-                lua_pushnil (L);
+  return pushresult(L, utime(file, buf), NULL);
-                lua_pushfstring (L, "%s", strerror (errno));
-                return 2;
-        }
-        lua_pushboolean (L, 1);
-        return 1;
 }
 
 
@@ -808,9 +796,10 @@ static int _file_info_ (lua_State *L, int (*st)(const char*, STAT_STRUCT*)) {
         int i;
 
         if (st(file, &info)) {
-                lua_pushnil (L);
+                lua_pushnil(L);
-                lua_pushfstring (L, "cannot obtain information from file `%s'", file);
+                lua_pushfstring(L, "cannot obtain information from file '%s': %s", file, strerror(errno));
-                return 2;
+                lua_pushinteger(L, errno);
+                return 3;
         }
         if (lua_isstring (L, 2)) {
                 const char *member = lua_tostring (L, 2);
@@ -822,9 +811,10 @@ static int _file_info_ (lua_State *L, int (*st)(const char*, STAT_STRUCT*)) {
                         }
                 }
                 /* member not found */
-                return luaL_error(L, "invalid attribute name");
+                return luaL_error(L, "invalid attribute name '%s'", member);
         }
-        /* creates a table if none is given */
+        /* creates a table if none is given, removes extra arguments */
+        lua_settop(L, 2);
         if (!lua_istable (L, 2)) {
                 lua_newtable (L);
         }
@@ -846,11 +836,58 @@ static int file_info (lua_State *L) {
 }
 
 
+/*
+** Push the symlink target to the top of the stack.
+** Assumes the file name is at position 1 of the stack.
+** Returns 1 if successful (with the target on top of the stack),
+** 0 on failure (with stack unchanged, and errno set).
+*/
+static int push_link_target(lua_State *L) {
+#ifdef _WIN32
+        errno = ENOSYS;
+        return 0;
+#else
+        const char *file = luaL_checkstring(L, 1);
+        char *target = NULL;
+        int tsize, size = 256; /* size = initial buffer capacity */
+        while (1) {
+            target = realloc(target, size);
+            if (!target) /* failed to allocate */
+                return 0;
+            tsize = readlink(file, target, size);
+            if (tsize < 0) { /* a readlink() error occurred */
+                free(target);
+                return 0;
+            }
+            if (tsize < size)
+                break;
+            /* possibly truncated readlink() result, double size and retry */
+            size *= 2;
+        }
+        target[tsize] = '\0';
+        lua_pushlstring(L, target, tsize);
+        free(target);
+        return 1;
+#endif
+}
+
 /*
 ** Get symbolic link information using lstat.
 */
 static int link_info (lua_State *L) {
-        return _file_info_ (L, LSTAT_FUNC);
+        int ret;
+        if (lua_isstring (L, 2) && (strcmp(lua_tostring(L, 2), "target") == 0)) {
+                int ok = push_link_target(L);
+                return ok ? 1 : pusherror(L, "could not obtain link target");
+        }
+        ret = _file_info_ (L, LSTAT_FUNC);
+        if (ret == 1 && lua_type(L, -1) == LUA_TTABLE) {
+                int ok = push_link_target(L);
+                if (ok) {
+                        lua_setfield(L, -2, "target");
+                }
+        }
+        return ret;
 }
 
 
@@ -858,15 +895,12 @@ static int link_info (lua_State *L) {
 ** 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) 2003-2016 Kepler Project");
-        lua_pushliteral (L, "Copyright (C) 2003-2012 Kepler Project");
+  lua_setfield(L, -2, "_COPYRIGHT");
-        lua_settable (L, -3);
+  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_pushliteral (L, "_DESCRIPTION");
+  lua_setfield(L, -2, "_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_pushliteral(L, "LuaFileSystem " LFS_VERSION);
-        lua_settable (L, -3);
+  lua_setfield(L, -2, "_VERSION");
-        lua_pushliteral (L, "_VERSION");
-        lua_pushliteral (L, "LuaFileSystem "LFS_VERSION);
-        lua_settable (L, -3);
 }
 
 
@@ -887,12 +921,10 @@ static const struct luaL_Reg fslib[] = {
         {NULL, NULL},
 };
 
-int luaopen_lfs (lua_State *L) {
+LFS_EXPORT int luaopen_lfs (lua_State *L) {
         dir_create_meta (L);
         lock_create_meta (L);
         luaL_newlib (L, fslib);
-        lua_pushvalue(L, -1);
-        lua_setglobal(L, LFS_LIBNAME);
         set_info (L);
         return 1;
 }

src/lfs.def

@@ -1,5 +1,4 @@
 LIBRARY lfs.dll
-DESCRIPTION "LuaFileSystem"
+VERSION 1.6
-VERSION 1.5.0
 EXPORTS
 luaopen_lfs

src/lfs.h

@@ -1,25 +1,34 @@
 /*
 ** LuaFileSystem
-** Copyright Kepler Project 2003 (http://www.keplerproject.org/luafilesystem)
+** Copyright Kepler Project 2003 - 2016 (http://keplerproject.github.io/luafilesystem)
-**
-** $Id: lfs.h,v 1.5 2008/02/19 20:08:23 mascarenhas Exp $
 */
 
 /* Define 'chdir' for systems that do not implement it */
 #ifdef NO_CHDIR
-#define chdir(p)	(-1)
+  #define chdir(p)	(-1)
-#define chdir_error	"Function 'chdir' not provided by system"
+  #define chdir_error	"Function 'chdir' not provided by system"
 #else
-#define chdir_error	strerror(errno)
+  #define chdir_error	strerror(errno)
-
 #endif
 
 #ifdef _WIN32
-#define chdir(p) (_chdir(p))
+  #define chdir(p) (_chdir(p))
-#define getcwd(d, s) (_getcwd(d, s))
+  #define getcwd(d, s) (_getcwd(d, s))
-#define rmdir(p) (_rmdir(p))
+  #define rmdir(p) (_rmdir(p))
-#define fileno(f) (_fileno(f))
+  #define LFS_EXPORT __declspec (dllexport)
+  #ifndef fileno
+    #define fileno(f) (_fileno(f))
+  #endif
+#else
+  #define LFS_EXPORT
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-int luaopen_lfs (lua_State *L);
+LFS_EXPORT  int luaopen_lfs (lua_State *L);
+
+#ifdef __cplusplus
+}
+#endif

tests/test.lua

@@ -88,9 +88,13 @@ io.write(".")
 io.flush()
 
 -- Checking link (does not work on Windows)
-if lfs.link (tmpfile, "_a_link_for_test_", true) then
+local link_ok = lfs.link (tmpfile, "_a_link_for_test_", true)
+if link_ok then
+  assert (link_ok == true, "successful lfs.link did not return true")
   assert (lfs.attributes"_a_link_for_test_".mode == "file")
   assert (lfs.symlinkattributes"_a_link_for_test_".mode == "link")
+  assert (lfs.symlinkattributes"_a_link_for_test_".target == tmpfile)
+  assert (lfs.symlinkattributes("_a_link_for_test_", "target") == tmpfile)
   assert (lfs.link (tmpfile, "_a_hard_link_for_test_"))
   assert (lfs.attributes (tmpfile, "nlink") == 2)
   assert (os.remove"_a_link_for_test_")
@@ -107,6 +111,9 @@ assert(result) -- on non-Windows platforms, mode is always returned as "binary"
 result, mode = lfs.setmode(f, "text")
 assert(result and mode == "binary")
 f:close()
+local ok, err = pcall(lfs.setmode, f, "binary")
+assert(not ok, "could setmode on closed file")
+assert(err:find("closed file"), "bad error message for setmode on closed file")
 
 io.write(".")
 io.flush()
@@ -127,6 +134,17 @@ for key, value in pairs(attr) do
           "lfs.attributes values not consistent")
 end
 
+-- Check that lfs.attributes accepts a table as second argument
+local attr2 = {}
+lfs.attributes(tmpfile, attr2)
+for key, value in pairs(attr2) do
+  assert (value == lfs.attributes (tmpfile, key),
+          "lfs.attributes values with table argument not consistent")
+end
+
+-- Check that extra arguments are ignored
+lfs.attributes(tmpfile, attr2, nil)
+
 -- Remove new file and directory
 assert (os.remove (tmpfile), "could not remove new file")
 assert (lfs.rmdir (tmpdir), "could not remove new directory")
@@ -136,7 +154,10 @@ io.write(".")
 io.flush()
 
 -- 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")
+local attr_ok, err, errno = lfs.attributes("this couldn't be an actual file")
+assert(attr_ok == nil, "could get attributes of a non-existent file")
+assert(type(err) == "string", "failed lfs.attributes did not return an error message")
+assert(type(errno) == "number", "failed lfs.attributes did not return error code")
 assert (type(lfs.attributes (upper)) == "table", "couldn't get attributes of upper directory")
 
 io.write(".")