Lua 5.1 compatibility

Add a 'target' field for symlinkattributes.
It returns the resolved path of the symlink.
2026-07-22 11:03:07 +00:00 · 2016-06-20 20:40:01 -03:00 · 2016-06-20 20:32:20 -03:00 · 2016-06-09 13:28:56 +03:00 · 2016-06-01 17:52:07 -03:00 · 2016-05-05 12:12:07 +03:00
16 changed files with 242 additions and 300 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.so
+
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,33 @@
 language: c

-env:
-  global:
-    - LUAROCKS=2.2.0-rc1
-  matrix:
-    - LUA=lua5.1
-    - LUA=lua5.2
-    - LUA=lua5.3
-    - LUA=luajit
+sudo: false

-branches:
-  only:
-    - master
+env:
+  - LUA="lua 5.1"
+  - LUA="lua 5.2"
+  - LUA="lua 5.3"
+  - LUA="luajit 2.0"

 before_install:
-  - bash .travis/setup_lua.sh
-  - sudo pip install cpp-coveralls
+  - pip install --user cpp-coveralls hererocks
+  - 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: 
-  - cd tests
-  - sudo lua test.lua
+script:
+  - lua -lluacov tests/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:
--- a/.travis/platform.sh
+++ b/.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
--- a/.travis/setup_lua.sh
+++ b/.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
--- a/2
+++ b/2
@@ -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
--- a/82
+++ b/82
@@ -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]
--- a/README.md
+++ b/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.
--- a/appveyor.yml
+++ b/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
--- a/doc/us/examples.html
+++ b/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" -->
--- a/doc/us/index.html
+++ b/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>]
-				lfs.attributes(filename, 'size') overflow on files > 2 Gb again  (bug report and patch by KUBO Takehiro).</li>
-			<li>fixed bug [<a href="http://luaforge.net/tracker/?group_id=66&amp;atid=356&amp;func=detail&amp;aid=39794">#39794</a>]
+			<li>fixed bug
+				<code>lfs.attributes(filename, 'size')</code> overflow on files > 2 Gb again  (bug report and patch by KUBO Takehiro).</li>
+			<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" -->
--- a/doc/us/license.html
+++ b/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" -->
--- a/doc/us/manual.html
+++ b/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
    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>
        
@@ -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>
@@ -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" -->
--- a/src/lfs.c
+++ b/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
@@ -117,10 +116,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,7 +127,7 @@ 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
@@ -197,15 +196,23 @@ static int get_dir (lua_State *L) {
 ** 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) {
-                luaL_error (L, "%s: not a file", funcname);
-                return 0;
-        } else if (*fh == NULL) {
+        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 +299,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 +332,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 +346,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;
-    lua_pushnil(L);
-    lua_pushfstring(L, "%s", strerror(en));
-    lua_pushinteger(L, en);
-    return 3;
+    return pusherror(L, NULL);
  }
 }

@@ -423,7 +425,8 @@ static int make_link(lua_State *L)
        return pushresult(L,
                (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
 }

@@ -808,8 +811,8 @@ static int _file_info_ (lua_State *L, int (*st)(const char*, STAT_STRUCT*)) {
        int i;

        if (st(file, &info)) {
-                lua_pushnil (L);
-                lua_pushfstring (L, "cannot obtain information from file `%s'", file);
+                lua_pushnil(L);
+                lua_pushfstring(L, "cannot obtain information from file '%s': %s", file, strerror(errno));
                return 2;
        }
        if (lua_isstring (L, 2)) {
@@ -822,7 +825,7 @@ 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 */
        if (!lua_istable (L, 2)) {
@@ -846,11 +849,74 @@ 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;
+        int size, tsize;
+        if (lua_type(L, -1) == LUA_TTABLE) {
+                /* when symlinkattributes collects the whole table,
+                   get the size from it */
+                lua_getfield(L, -1, "size");
+                int size_type = lua_type(L, -1);
+                if (size_type != LUA_TNUMBER) {
+                        lua_pop(L, 1);
+                        errno = EINVAL;
+                        return 0;
+                }
+                size = lua_tointeger(L, -1);
+                lua_pop(L, 1);
+        } else {
+                /* when we are just getting 'target', we need to run
+                   lstat ourselves to get the size */
+                STAT_STRUCT info;
+                if (LSTAT_FUNC(file, &info)) {
+                        return 0;
+                }
+                size = info.st_size;
+        }
+        target = (char*) malloc(size + 1);
+        if (!target) {
+                return 0;
+        }
+        tsize = readlink(file, target, size);
+        if (tsize != size) {
+                free(target);
+                return 0;
+        }
+        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 +924,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-2012 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, "_VERSION");
-        lua_pushliteral (L, "LuaFileSystem "LFS_VERSION);
-        lua_settable (L, -3);
+  lua_pushliteral(L, "Copyright (C) 2003-2016 Kepler Project");
+  lua_setfield(L, -2, "_COPYRIGHT");
+  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_setfield(L, -2, "_DESCRIPTION");
+  lua_pushliteral(L, "LuaFileSystem " LFS_VERSION);
+  lua_setfield(L, -2, "_VERSION");
 }


@@ -887,7 +950,7 @@ 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);
--- a/src/lfs.def
+++ b/src/lfs.def
@@ -1,5 +1,4 @@
 LIBRARY lfs.dll
-DESCRIPTION "LuaFileSystem"
-VERSION 1.5.0
+VERSION 1.6
 EXPORTS
 luaopen_lfs
--- a/src/lfs.h
+++ b/src/lfs.h
@@ -1,25 +1,34 @@
 /*
 ** LuaFileSystem
-** Copyright Kepler Project 2003 (http://www.keplerproject.org/luafilesystem)
-**
-** $Id: lfs.h,v 1.5 2008/02/19 20:08:23 mascarenhas Exp $
+** Copyright Kepler Project 2003 - 2016 (http://keplerproject.github.io/luafilesystem)
 */

 /* 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"
+  #define chdir(p)	(-1)
+  #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 getcwd(d, s) (_getcwd(d, s))
-#define rmdir(p) (_rmdir(p))
-#define fileno(f) (_fileno(f))
+  #define chdir(p) (_chdir(p))
+  #define getcwd(d, s) (_getcwd(d, s))
+  #define rmdir(p) (_rmdir(p))
+  #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
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -91,6 +91,8 @@ io.flush()
 if lfs.link (tmpfile, "_a_link_for_test_", true) then
  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 +109,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()
Author	SHA1	Message	Date
Hisham	a1015fe395	Lua 5.1 compatibility	2016-06-20 20:40:01 -03:00
Hisham	2e068eb438	Add a 'target' field for symlinkattributes. It returns the resolved path of the symlink.	2016-06-20 20:32:20 -03:00
Peter Melnichenko	7fae11cdb5	Add a test for #52 .	2016-06-09 13:28:56 +03:00
Eric Cosatto	6e0dc7b27c	Fix export of luaopen_lfs on Windows (#74 ) * Make lfs export luaopen_lfs under Windows	2016-06-01 17:52:07 -03:00
Peter Melnichenko	1937ba848b	Include strerror(errno) into error message in lfs.attributes	2016-05-05 12:12:07 +03:00
Peter Melnichenko	732f9e9309	Add attribute name to error on invalid attribute in lfs.attributes	2016-05-05 12:10:04 +03:00
Peter Melnichenko	03e01ff953	Document passing table as second argument to lfs.attributes	2016-05-04 18:25:06 +03:00
Peter Melnichenko	3789521838	Refactor set_info() using lua_setfield About indentation: currently parts of lfs.c use 2 spaces and parts use 8. It would be nice to slowly switch to one of styles over some time, as code is being touched here and there. 2 spaces seem preferrable as it's what Lua itself uses.	2016-05-04 13:40:30 +03:00
Peter Melnichenko	5220452e3b	Update top level comments	2016-05-04 13:35:55 +03:00
Peter Melnichenko	12d1f260f3	Fix a warning when compiling as C++11	2016-05-04 13:05:19 +03:00
Peter Melnichenko	e5458bfa74	Merge pull request #71 from jinq0123/fix_makefile Delete $(CFLAGS) in Makefile.	2016-05-04 13:58:49 +04:00
Peter Melnichenko	dd6376411f	Update docs [ci skip] Remove dead links, 'contact us' section with dead e-mail, etc.	2016-05-04 12:37:19 +03:00
Jin Qing	e3253069b9	Delete $(CFLAGS). $(CC) $(CFLAGS) $(LIB_OPTION) -o src/lfs.so $(OBJS) -> $(CC) $(LIB_OPTION) -o src/lfs.so $(OBJS)	2016-05-04 11:17:35 +08:00
Peter Melnichenko	83b8fa6c6b	Merge pull request #70 from mpeterv/hererocks-ci Use hererocks for CI	2016-05-04 03:18:58 +04:00
Peter Melnichenko	1146cc2b33	Use hererocks for Appveyor	2016-05-03 20:26:06 +03:00
Peter Melnichenko	a9a95acd68	Use hererocks for Travis-CI	2016-05-03 20:24:08 +03:00
Hisham Muhammad	210322f493	Merge pull request #69 from hughperkins/master add build artefact to .gitignore	2016-04-30 16:01:50 -03:00
Hugh Perkins	9cbb967b55	add build artefact to .gitignore	2016-04-30 20:37:37 +02:00
Peter Melnichenko	2d4d609d81	.travis.yml: run tests from root directory Fixes missing view for tests/test.lua coverage on coveralls site.	2016-04-26 11:00:34 +03:00
Hisham Muhammad	436bc441fa	Merge pull request #68 from mpeterv/setmode-refactor Minor refactoring of setmode	2016-04-25 16:56:26 -03:00
Hisham Muhammad	e519c13036	Merge pull request #66 from n1tehawk/contrib Have make_link() use pushresult() instead of pusherror() on Windows	2016-04-25 11:57:40 -03:00
Peter Melnichenko	c1e9c70214	Don't pass Lua state to lfs_setmode, it's always unused	2016-04-25 15:42:54 +03:00
Peter Melnichenko	655ec8baa3	Use pusherror in lfs_g_setmode	2016-04-25 15:36:37 +03:00
Peter Melnichenko	695def20ef	Get rid of goto in lfs_g_setmode	2016-04-25 15:33:12 +03:00
NiteHawk	ba6d0e1ad9	Have make_link() use pushresult() instead of pusherror() on Windows The pushresult(L, -1, ...) call will delegate to pusherror() anyway, but this avoids the "Unused static" warning for pushresult. Also take care of assigning something meaningful to `errno`, as strerror(errno) is used for constructing the Lua error message. Fixes #65	2016-03-25 13:07:13 +01:00
Ignacio Burgueño	95d946e0fe	Adds badges [ci skip]	2016-01-21 15:41:48 -03:00
Ignacio Burgueño	22d539e199	Adds AppVeyor integration	2016-01-21 15:28:14 -03:00
Ignacio Burgueño	3674e4f52f	Adds missing -lluacov test	2016-01-21 15:08:25 -03:00
Ignacio Burgueño	5daddd4c2b	Drop sudo from call	2016-01-21 14:58:15 -03:00
Ignacio Burgueño	6232ca6dbd	source script instead of just calling it Thanks @moteus	2016-01-21 14:56:15 -03:00
Ignacio Burgueño	7ede630d6d	Pass --user flag to pip	2016-01-21 14:53:32 -03:00
Ignacio Burgueño	5131a28067	Adds coverage Begin work adding coverage.	2016-01-21 14:08:20 -03:00
Ignacio Burgueño	9e7f97ea4c	Change readme to markdown format	2016-01-21 13:59:29 -03:00
Ignacio Burgueño	488304b5a5	Updates Travis CI scripts	2016-01-21 13:54:17 -03:00
Ignacio Burgueño	222330973c	Merge pull request #60 from MisterDA/doc-permissions Add documentation for attributes.permissions, fix #59	2016-01-18 14:43:39 -03:00
Antonin Décimo	c0965e8048	Add documentation for attributes.permissions, fix #59	2016-01-18 16:28:06 +01:00
Hisham Muhammad	6d039ff385	Merge pull request #53 from Tieske/fix_warning fix warning for redefining macro on MinGW	2015-08-24 16:32:49 -03:00
Thijs Schreijer	dc00750ea9	fix warning for redefining macro on MinGW	2015-08-24 20:54:36 +02:00
Hisham Muhammad	b6d5b37c1b	Merge pull request #52 from siffiejoe/checkfile Fix detection of closed files on Lua 5.2/5.3.	2015-06-15 17:25:40 -03:00
Philipp Janda	c315150aff	Fix detection of closed files on Lua 5.2/5.3. Lua 5.2 changed the protocol on how to represent closed files: Lua 5.1 sets the file pointer to NULL, Lua 5.2 sets the close function pointer to NULL (a NULL file pointer now signals an incompletely constructed object). Also `luaL_checkudata` never returns NULL, it raises an error instead if you have an invalid value (no userdata/not correct userdata type).	2015-06-14 22:44:46 +02:00
Hisham Muhammad	5f8b6461a2	Cleanup readme. Too many places with duplicated info.	2015-03-19 14:53:20 -03:00
Hisham Muhammad	75eed716c6	Merge branch 'master' of git://github.com/keplerproject/luafilesystem	2015-03-19 14:52:14 -03:00
Hisham Muhammad	3f9f2a5afd	Merge pull request #50 from catharanthus/master DEF file fixes	2015-02-19 04:04:42 -02:00
Alex	6fcb1bb8ad	Merge remote-tracking branch 'upstream/master'	2015-02-16 08:18:57 +03:00
Alex	644c9c32ca	DEF file fixes (DESCRIPTION is deprecated; VERSION must contain one or two numers)	2015-02-16 08:15:41 +03:00
Hisham Muhammad	3cc1a84c93	Merge pull request #49 from catharanthus/master Minor fixes needed to compile LFS as C++	2015-02-15 11:31:04 -02:00
Alex	25ecbd31db	A few minor things fixed which prevented compilation of LuaFileSystem as C++ code	2015-02-15 08:20:50 +03:00