diff options
Diffstat (limited to '3rdparty/luafilesystem')
33 files changed, 1145 insertions, 1290 deletions
diff --git a/3rdparty/luafilesystem/.gitignore b/3rdparty/luafilesystem/.gitignore new file mode 100644 index 00000000000..ddaacd81f47 --- /dev/null +++ b/3rdparty/luafilesystem/.gitignore @@ -0,0 +1,2 @@ +*.so + diff --git a/3rdparty/luafilesystem/.travis.yml b/3rdparty/luafilesystem/.travis.yml index 67b5812e09e..618e48e1544 100644 --- a/3rdparty/luafilesystem/.travis.yml +++ b/3rdparty/luafilesystem/.travis.yml @@ -1,31 +1,32 @@ 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.1" 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-path + - luarocks install dkjson + - luarocks install luacov + # install luacov-coveralls, but avoid 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 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: diff --git a/3rdparty/luafilesystem/.travis/platform.sh b/3rdparty/luafilesystem/.travis/platform.sh deleted file mode 100644 index 4a3af0d487e..00000000000 --- a/3rdparty/luafilesystem/.travis/platform.sh +++ /dev/null @@ -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 diff --git a/3rdparty/luafilesystem/.travis/setup_lua.sh b/3rdparty/luafilesystem/.travis/setup_lua.sh deleted file mode 100644 index 373e24d979b..00000000000 --- a/3rdparty/luafilesystem/.travis/setup_lua.sh +++ /dev/null @@ -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 diff --git a/3rdparty/luafilesystem/Makefile b/3rdparty/luafilesystem/Makefile index b834a4d51ab..a7312a425d2 100644 --- a/3rdparty/luafilesystem/Makefile +++ b/3rdparty/luafilesystem/Makefile @@ -12,14 +12,14 @@ 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=$(MACOSX_DEPLOYMENT_TARGET); export MACOSX_DEPLOYMENT_TARGET; $(CC) $(LIB_OPTION) -o src/lfs.so $(OBJS) test: lib LUA_CPATH=./src/?.so lua tests/test.lua install: - mkdir -p $(LUA_LIBDIR) - cp src/lfs.so $(LUA_LIBDIR) + mkdir -p $(DESTDIR)$(LUA_LIBDIR) + cp src/lfs.so $(DESTDIR)$(LUA_LIBDIR) clean: rm -f src/lfs.so $(OBJS) diff --git a/3rdparty/luafilesystem/README b/3rdparty/luafilesystem/README deleted file mode 100644 index 9d37a4e2513..00000000000 --- a/3rdparty/luafilesystem/README +++ /dev/null @@ -1,23 +0,0 @@ -LuaFileSystem - File System Library for Lua -Copyright 2003-2015 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. diff --git a/3rdparty/luafilesystem/README.md b/3rdparty/luafilesystem/README.md new file mode 100644 index 00000000000..d0fd3f29e8e --- /dev/null +++ b/3rdparty/luafilesystem/README.md @@ -0,0 +1,28 @@ +[](LICENSE) +[](https://travis-ci.org/keplerproject/luafilesystem) +[](https://ci.appveyor.com/project/ignacio/luafilesystem) +[](https://coveralls.io/r/keplerproject/luafilesystem) + +# LuaFileSystem - File System Library for Lua + +Copyright 2003-2020 Kepler Project + +https://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.x (MIT). + +# LuaRocks Installation + +``` +luarocks install luafilesystem +``` + +# Documentation + +Please check the documentation at doc/us/ for more information. diff --git a/3rdparty/luafilesystem/appveyor.yml b/3rdparty/luafilesystem/appveyor.yml new file mode 100644 index 00000000000..ddd651c98c6 --- /dev/null +++ b/3rdparty/luafilesystem/appveyor.yml @@ -0,0 +1,41 @@ +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.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 + +before_test: + +test_script: +- echo "Testing..." +- lua tests/test.lua + +after_test: +# @todo diff --git a/3rdparty/luafilesystem/config b/3rdparty/luafilesystem/config index cfd4c6a6d3e..33fe514699a 100644 --- a/3rdparty/luafilesystem/config +++ b/3rdparty/luafilesystem/config @@ -3,21 +3,25 @@ # Default installation prefix PREFIX=/usr/local +LUA_VERSION = 5.1 + # System's libraries directory (where binary libraries are installed) -LUA_LIBDIR= $(PREFIX)/lib/lua/5.1 +LUA_LIBDIR= $(PREFIX)/lib/lua/$(LUA_VERSION) # Lua includes directory -LUA_INC= $(PREFIX)/include +LUA_INC += -I$(PREFIX)/include +LUA_INC += -I/usr/include/lua$(LUA_VERSION) -I/usr/include/lua/$(LUA_VERSION) # OS dependent LIB_OPTION= -shared #for Linux #LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X -LIBNAME= $T.so.$V +# Minimum runtime OS version on macOS +MACOSX_DEPLOYMENT_TARGET= 10.5 # Compilation directives WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic -INCS= -I$(LUA_INC) +INCS= $(LUA_INC) CFLAGS= $(WARN) $(INCS) CC= gcc diff --git a/3rdparty/luafilesystem/config.win b/3rdparty/luafilesystem/config.win index 50e81f64206..6aeaa60c5f2 100644 --- a/3rdparty/luafilesystem/config.win +++ b/3rdparty/luafilesystem/config.win @@ -1,14 +1,14 @@ +LUA_VERSION= 5.1 + # Installation directories # System's libraries directory (where binary libraries are installed) -LUA_LIBDIR= "c:\lua5.1" +LUA_LIBDIR= "c:\lua$(LUA_VERSION)" # Lua includes directory -LUA_INC= "c:\lua5.1\include" +LUA_INC= "c:\lua$(LUA_VERSION)\include" # Lua library -LUA_LIB= "c:\lua5.1\lua5.1.lib" - -LIBNAME= $T.dll +LUA_LIB= "c:\lua$(LUA_VERSION)\lua$(LUA_VERSION).lib" # Compilation directives WARN= /O2 diff --git a/3rdparty/luafilesystem/doc/us/doc.css b/3rdparty/luafilesystem/doc/us/doc.css index e816a7e2c63..f233ce4f089 100644 --- a/3rdparty/luafilesystem/doc/us/doc.css +++ b/3rdparty/luafilesystem/doc/us/doc.css @@ -1,182 +1,179 @@ body { - margin-left: 1em; - margin-right: 1em; - font-family: arial, helvetica, geneva, sans-serif; - background-color:#ffffff; margin:0px; + color: #47555c; + font-size: 16px; + font-family: "Open Sans", sans-serif; + margin: 0; + padding: 0; + background: #eff4ff; +} + +a:link { color: #008fee; } +a:visited { color: #008fee; } +a:hover { color: #22a7ff; } + +h1 { font-size:26px; } +h2 { font-size:24px; } +h3 { font-size:18px; } +h4 { font-size:16px; } + +hr { + height: 1px; + background: #c1cce4; + border: 0px; + margin: 20px 0; } code { - font-family: "Andale Mono", monospace; + font-family: "Open Sans Mono", "Andale Mono", monospace; } tt { - font-family: "Andale Mono", monospace; + font-family: "Open Sans Mono", "Andale Mono", monospace; } -body, td, th { font-size: 11pt; } - -h1, h2, h3, h4 { margin-left: 0em; } - -textarea, pre, tt { font-size:10pt; } -body, td, th { color:#000000; } -small { font-size:0.85em; } -h1 { font-size:1.5em; } -h2 { font-size:1.25em; } -h3 { font-size:1.15em; } -h4 { font-size:1.06em; } - -a:link { font-weight:bold; color: #004080; text-decoration: none; } -a:visited { font-weight:bold; color: #006699; text-decoration: none; } -a:link:hover { text-decoration:underline; } -hr { color:#cccccc } -img { border-width: 0px; } - -h3 { padding-top: 1em; } - -p { margin-left: 1em; } - -p.name { - font-family: "Andale Mono", monospace; - padding-top: 1em; - margin-left: 0em; +body, td, th { } -blockquote { margin-left: 3em; } - -.example { - background-color: rgb(245, 245, 245); - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - border-top-style: solid; - border-right-style: solid; - border-bottom-style: solid; - border-left-style: solid; - border-top-color: silver; - border-right-color: silver; - border-bottom-color: silver; - border-left-color: silver; - padding: 1em; - margin-left: 1em; - margin-right: 1em; - font-family: "Andale Mono", monospace; - font-size: smaller; -} - -hr { - margin-left: 0em; - background: #00007f; - border: 0px; - height: 1px; +textarea, pre, tt { + font-family: "Open Sans Mono", "Andale Mono", monospace; } -ul { list-style-type: disc; } - -table.index { border: 1px #00007f; } -table.index td { text-align: left; vertical-align: top; } -table.index ul { padding-top: 0em; margin-top: 0em; } - -table { - border: 1px solid black; - border-collapse: collapse; - margin-left: auto; - margin-right: auto; +img { + border-width: 0px; } -th { - border: 1px solid black; - padding: 0.5em; +.example { + background-color: #323744; + color: white; + font-size: 16px; + padding: 16px 24px; + border-radius: 2px; } -td { - border: 1px solid black; - padding: 0.5em; +div.header, div.footer { } -div.header, div.footer { margin-left: 0em; } #container { - margin-left: 1em; - margin-right: 1em; - background-color: #f0f0f0; } #product { - text-align: center; - border-bottom: 1px solid #cccccc; - background-color: #ffffff; + background-color: white; + padding: 10px; + height: 130px; + border-bottom: solid #d3dbec 1px; } #product big { - font-size: 2em; + font-size: 42px; +} +#product strong { + font-weight: normal; } #product_logo { + float: right; } #product_name { + padding-top: 15px; + padding-left: 30px; + font-size: 42px; + font-weight: normal; } #product_description { + padding-left: 30px; + color: #757779; } #main { - background-color: #f0f0f0; - border-left: 2px solid #cccccc; + background: #eff4ff; + margin: 0; } #navigation { - float: left; - width: 12em; + width: 100%; + background-color: rgb(44,62,103); + padding: 10px; margin: 0; - vertical-align: top; - background-color: #f0f0f0; - overflow:visible; } #navigation h1 { - background-color:#e7e7e7; - font-size:1.1em; - color:#000000; - text-align:left; - margin:0px; - padding:0.2em; - border-top:1px solid #dddddd; - border-bottom:1px solid #dddddd; + display: none; +} + +#navigation a:hover { + text-decoration: underline; +} + +#navigation ul li a { + color: rgb(136, 208, 255); + font-weight: bold; + text-decoration: none; +} + +#navigation ul li li a { + color: rgb(136, 208, 255); + font-weight: normal; + text-decoration: none; } #navigation ul { - font-size:1em; + display: inline; + color: white; + padding: 0px; + padding-top: 10px; + padding-bottom: 10px; +} + +#navigation li { + display: inline; list-style-type: none; - padding: 0; - margin: 1px; + padding-left: 5px; + padding-right: 5px; } #navigation li { - text-indent: -1em; - margin: 0em 0em 0em 0.5em; - display: block; - padding: 3px 0px 0px 12px; + padding: 10px; + padding: 10px; +} + +#navigation li li { } -#navigation li li a { - padding: 0px 3px 0px -1em; +#navigation li:hover a { + color: rgb(166, 238, 255); } #content { - margin-left: 12em; - padding: 1em; - border-left: 2px solid #cccccc; - border-right: 2px solid #cccccc; - background-color: #ffffff; + padding: 20px; + width: 800px; + margin-left: auto; + margin-right: auto; } #about { - clear: both; - margin: 0; + display: none; +} + +dl.reference { + background-color: white; + padding: 20px; + border: solid #d3dbec 1px; +} + +dl.reference dt { padding: 5px; - border-top: 2px solid #cccccc; - background-color: #ffffff; + padding-top: 25px; + color: #637bbc; +} + +dl.reference dl dt { + padding-top: 5px; + color: #637383; +} + +dl.reference dd { } @media print { diff --git a/3rdparty/luafilesystem/doc/us/examples.html b/3rdparty/luafilesystem/doc/us/examples.html index 2c1644cb8a0..68756c8b1d4 100644 --- a/3rdparty/luafilesystem/doc/us/examples.html +++ b/3rdparty/luafilesystem/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" --> diff --git a/3rdparty/luafilesystem/doc/us/index.html b/3rdparty/luafilesystem/doc/us/index.html index 2bb7f5d2cbb..5a2afc0354d 100644 --- a/3rdparty/luafilesystem/doc/us/index.html +++ b/3rdparty/luafilesystem/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,21 +66,43 @@ 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> -<p>Current version is 1.6.3. It works with Lua 5.1, 5.2 and 5.3.</p> +<p>Current version is 1.8.0. It works with Lua 5.1, 5.2, 5.3 and 5.4, and it runs on various +flavors of Unix (including Linux, BSDs, macOS) and Windows.</p> <h2><a name="download"></a>Download</h2> -<p>LuaFileSystem source can be downloaded from its -<a href="http://github.com/keplerproject/luafilesystem">Github</a> -page.</p> +<p>LuaFileSystem can be installed using <a href="https://luarocks.org">LuaRocks</a>: + +<pre class="example"> +$ luarocks install luafilesystem +</pre> + +<p>Its source can be found at its <a href="http://github.com/keplerproject/luafilesystem">Github</a> page.</p> <h2><a name="history"></a>History</h2> <dl class="history"> + <dt><strong>Version 1.8.0</strong> [22/Apr/2020]</dt> + <dd><ul> + <li>Lua 5.4 support</li> + <li>lfs.link and lfs.symlinkattributes now work on Windows</li> + <li>MACOSX_DEPLOYMENT_TARGET is configurable in the Makefile</li> + <li>Fallback to _POSIX_PATH_MAX when MAXPATHLEN is not avaliable</li> + <li>Fixed memory leak in case of realloc failure</li> + </ul></dd> + + <dt><strong>Version 1.7.0</strong> [15/Sep/2017]</dt> + <dd><ul> + <li>symlinkattributes function now provides 'target' field, containing name of the file that the symlink points to.</li> + <li>attributes, symlinkattributes, touch, mkdir, and rmdir functions now return system-dependent error code as the third value on error.</li> + <li>Fixed detection of closed files for Lua 5.2+ in setmode, lock, and unlock functions.</li> + <li>Fixed various compiler warnings.</li> + </ul></dd> + <dt><strong>Version 1.6.3</strong> [15/Jan/2015]</dt> <dd><ul> <li>Lua 5.3 support.</li> @@ -115,9 +136,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&group_id=66&aid=13198&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&atid=356&func=detail&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 +150,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&group_id=66&aid=2185&atid=356">#2185</a>] + <li>fixed bug <code>lfs.attributes(filename, 'size')</code> overflow on files > 2 Gb </li> </ul> @@ -191,25 +212,15 @@ page.</p> <p>LuaFileSystem was designed by Roberto Ierusalimschy, André Carregal and Tomá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á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" --> diff --git a/3rdparty/luafilesystem/doc/us/license.html b/3rdparty/luafilesystem/doc/us/license.html index 30033817229..f77eba0a002 100644 --- a/3rdparty/luafilesystem/doc/us/license.html +++ b/3rdparty/luafilesystem/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> @@ -85,7 +84,7 @@ Ierusalimschy, André Carregal and Tomás Guisasola. The implementation is not derived from licensed software.</p> <hr/> -<p>Copyright © 2003 Kepler Project.</p> +<p>Copyright © 2003 - 2020 Kepler Project.</p> <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -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" --> diff --git a/3rdparty/luafilesystem/doc/us/manual.html b/3rdparty/luafilesystem/doc/us/manual.html index 33c1cbea573..1feb86a6423 100644 --- a/3rdparty/luafilesystem/doc/us/manual.html +++ b/3rdparty/luafilesystem/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 [, request_name | result_table])</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)[request_name]</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 (<code>result_table</code>) 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; - in case of error, it returns <code>nil</code> plus an error string. + Returns <code>true</code> in case of success or <code>nil</code>, an error message and + 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; - in case of error, it returns <code>nil</code> plus an error string.</dd> + Returns <code>true</code> in case of success or <code>nil</code>, an error message and + 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>. @@ -234,9 +239,11 @@ LuaFileSystem offers the following functions: setting the mode has no effect, and the mode is always returned as <code>binary</code>. </dd> - <dt><a name="symlinkattributes"></a><strong><code>lfs.symlinkattributes (filepath [, aname])</code></strong></dt> + <dt><a name="symlinkattributes"></a><strong><code>lfs.symlinkattributes (filepath [, request_name])</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; - in case of error, it returns <code>nil</code> plus an error string. + Returns <code>true</code> in case of success or <code>nil</code>, an error message and + 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" --> diff --git a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.6.3-1.rockspec b/3rdparty/luafilesystem/luafilesystem-scm-1.rockspec index 89b25d42fe3..71cf19b495d 100644 --- a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.6.3-1.rockspec +++ b/3rdparty/luafilesystem/luafilesystem-scm-1.rockspec @@ -1,8 +1,7 @@ -package = "LuaFileSystem" -version = "1.6.3-1" +package = "luafilesystem" +version = "scm-1" source = { - url = "git://github.com/keplerproject/luafilesystem", - tag = "v_1_6_3", + url = "git://github.com/keplerproject/luafilesystem" } description = { summary = "File System Library for the Lua Programming Language", @@ -12,7 +11,7 @@ description = { distribution. LuaFileSystem offers a portable way to access the underlying directory structure and file attributes. ]], - license = "MIT/X11", + license = "MIT/X11" } dependencies = { "lua >= 5.1" @@ -23,6 +22,7 @@ build = { lfs = "src/lfs.c" }, copy_directories = { - "doc", "tests" + "doc", + "tests" } } diff --git a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.3.0-1.rockspec b/3rdparty/luafilesystem/rockspecs/luafilesystem-1.3.0-1.rockspec deleted file mode 100644 index d4d484f68a7..00000000000 --- a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.3.0-1.rockspec +++ /dev/null @@ -1,27 +0,0 @@ -package = "LuaFileSystem" -version = "1.3.0-1" -source = { - url = "http://luaforge.net/frs/download.php/2679/luafilesystem-1.3.0.tar.gz" -} -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} -dependencies = { - "lua >= 5.1" -} -build = { - type = "make", - build_variables = { - LUA_INC = "$(LUA_INCDIR)", - LIB_OPTION = "$(LIBFLAG)" - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)" - } -} diff --git a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.4.0-1.rockspec b/3rdparty/luafilesystem/rockspecs/luafilesystem-1.4.0-1.rockspec deleted file mode 100644 index b6936182394..00000000000 --- a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.4.0-1.rockspec +++ /dev/null @@ -1,27 +0,0 @@ -package = "LuaFileSystem" -version = "1.4.0-1" -source = { - url = "http://luaforge.net/frs/download.php/3158/luafilesystem-1.4.0.tar.gz" -} -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} -dependencies = { - "lua >= 5.1" -} -build = { - type = "make", - build_variables = { - LUA_INC = "$(LUA_INCDIR)", - LIB_OPTION = "$(LIBFLAG)" - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)" - } -} diff --git a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.4.0-2.rockspec b/3rdparty/luafilesystem/rockspecs/luafilesystem-1.4.0-2.rockspec deleted file mode 100644 index f7ed871527f..00000000000 --- a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.4.0-2.rockspec +++ /dev/null @@ -1,43 +0,0 @@ -package = "LuaFileSystem" -version = "1.4.0-2" -source = { - url = "http://luaforge.net/frs/download.php/3158/luafilesystem-1.4.0.tar.gz" -} -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} -dependencies = { - "lua >= 5.1" -} -build = { - platforms = { - unix = { - type = "make", - build_variables = { - LIB_OPTION = "$(LIBFLAG)", - CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR)", - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)" - } - }, - win32 = { - type = "make", - build_variables = { - LUA_LIB = "$(LUA_LIBDIR)\\lua5.1.lib", - CFLAGS = "/MD $(CFLAGS) /I$(LUA_INCDIR)", - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)", - LUA_DIR = "$(LUADIR)", - BIN_DIR = "$(BINDIR)" - } - } - } -}
\ No newline at end of file diff --git a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.4.1-1.rockspec b/3rdparty/luafilesystem/rockspecs/luafilesystem-1.4.1-1.rockspec deleted file mode 100644 index db3a3ebb6df..00000000000 --- a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.4.1-1.rockspec +++ /dev/null @@ -1,43 +0,0 @@ -package = "LuaFileSystem" -version = "1.4.1-1" -source = { - url = "http://luaforge.net/frs/download.php/3345/luafilesystem-1.4.1.tar.gz", -} -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} -dependencies = { - "lua >= 5.1" -} -build = { - platforms = { - unix = { - type = "make", - build_variables = { - LIB_OPTION = "$(LIBFLAG)", - CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR) $(STAT64)", - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)" - } - }, - win32 = { - type = "make", - build_variables = { - LUA_LIB = "$(LUA_LIBDIR)\\lua5.1.lib", - CFLAGS = "/MD $(CFLAGS) /I$(LUA_INCDIR)", - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)", - LUA_DIR = "$(LUADIR)", - BIN_DIR = "$(BINDIR)" - } - } - } -} diff --git a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.4.1rc1-1.rockspec b/3rdparty/luafilesystem/rockspecs/luafilesystem-1.4.1rc1-1.rockspec deleted file mode 100644 index 1194711715b..00000000000 --- a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.4.1rc1-1.rockspec +++ /dev/null @@ -1,43 +0,0 @@ -package = "LuaFileSystem" -version = "1.4.1rc1-1" -source = { - url = "http://luafilesystem.luaforge.net/luafilesystem-1.4.1rc1.tar.gz", -} -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} -dependencies = { - "lua >= 5.1" -} -build = { - platforms = { - unix = { - type = "make", - build_variables = { - LIB_OPTION = "$(LIBFLAG)", - CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR) $(STAT64)", - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)" - } - }, - win32 = { - type = "make", - build_variables = { - LUA_LIB = "$(LUA_LIBDIR)\\lua5.1.lib", - CFLAGS = "/MD $(CFLAGS) /I$(LUA_INCDIR)", - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)", - LUA_DIR = "$(LUADIR)", - BIN_DIR = "$(BINDIR)" - } - } - } -} diff --git a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.4.2-1.rockspec b/3rdparty/luafilesystem/rockspecs/luafilesystem-1.4.2-1.rockspec deleted file mode 100644 index 7cfe92b78ef..00000000000 --- a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.4.2-1.rockspec +++ /dev/null @@ -1,26 +0,0 @@ -package = "LuaFileSystem" - -version = "1.4.2-1" - -source = { - url = "http://luaforge.net/frs/download.php/3931/luafilesystem-1.4.2.tar.gz", -} - -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} - -dependencies = { - "lua >= 5.1" -} - -build = { - type = "module", - modules = { lfs = "src/lfs.c" } -}
\ No newline at end of file diff --git a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.5.0-1.rockspec b/3rdparty/luafilesystem/rockspecs/luafilesystem-1.5.0-1.rockspec deleted file mode 100644 index 1170ad25c90..00000000000 --- a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.5.0-1.rockspec +++ /dev/null @@ -1,27 +0,0 @@ -package = "LuaFileSystem" - -version = "1.5.0-1" - -source = { - url = "http://cloud.github.com/downloads/keplerproject/luafilesystem/luafilesystem-1.5.0.tar.gz", -} - -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} - -dependencies = { - "lua >= 5.1" -} - -build = { - type = "module", - modules = { lfs = "src/lfs.c" }, - copy_directories = { "doc", "tests" } -} diff --git a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.6.0-1.rockspec b/3rdparty/luafilesystem/rockspecs/luafilesystem-1.6.0-1.rockspec deleted file mode 100644 index 82d349cf016..00000000000 --- a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.6.0-1.rockspec +++ /dev/null @@ -1,27 +0,0 @@ -package = "LuaFileSystem" - -version = "1.6.0-1" - -source = { - url = "https://github.com/downloads/keplerproject/luafilesystem/luafilesystem-1.6.0.tar.gz", -} - -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} - -dependencies = { - "lua >= 5.1" -} - -build = { - type = "builtin", - modules = { lfs = "src/lfs.c" }, - copy_directories = { "doc", "tests" } -} diff --git a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.6.1-1.rockspec b/3rdparty/luafilesystem/rockspecs/luafilesystem-1.6.1-1.rockspec deleted file mode 100644 index 7f45e332c44..00000000000 --- a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.6.1-1.rockspec +++ /dev/null @@ -1,27 +0,0 @@ -package = "LuaFileSystem" - -version = "1.6.1-1" - -source = { - url = "https://github.com/downloads/keplerproject/luafilesystem/luafilesystem-1.6.1.tar.gz", -} - -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} - -dependencies = { - "lua >= 5.1" -} - -build = { - type = "builtin", - modules = { lfs = "src/lfs.c" }, - copy_directories = { "doc", "tests" } -} diff --git a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.6.2-1.rockspec b/3rdparty/luafilesystem/rockspecs/luafilesystem-1.6.2-1.rockspec deleted file mode 100644 index 1c11efc89e1..00000000000 --- a/3rdparty/luafilesystem/rockspecs/luafilesystem-1.6.2-1.rockspec +++ /dev/null @@ -1,27 +0,0 @@ -package = "LuaFileSystem" - -version = "1.6.2-1" - -source = { - url = "https://github.com/downloads/keplerproject/luafilesystem/luafilesystem-1.6.2.tar.gz", -} - -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} - -dependencies = { - "lua >= 5.1" -} - -build = { - type = "builtin", - modules = { lfs = "src/lfs.c" }, - copy_directories = { "doc", "tests" } -} diff --git a/3rdparty/luafilesystem/rockspecs/luafilesystem-cvs-1.rockspec b/3rdparty/luafilesystem/rockspecs/luafilesystem-cvs-1.rockspec deleted file mode 100644 index a02d4f14e71..00000000000 --- a/3rdparty/luafilesystem/rockspecs/luafilesystem-cvs-1.rockspec +++ /dev/null @@ -1,44 +0,0 @@ -package = "LuaFileSystem" -version = "cvs-1" -source = { - url = "cvs://:pserver:anonymous:@cvs.luaforge.net:/cvsroot/luafilesystem", - cvs_tag = "HEAD" -} -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} -dependencies = { - "lua >= 5.1" -} -build = { - platforms = { - unix = { - type = "make", - build_variables = { - LIB_OPTION = "$(LIBFLAG)", - CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR)", - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)" - } - }, - win32 = { - type = "make", - build_variables = { - LUA_LIB = "$(LUA_LIBDIR)\\lua5.1.lib", - CFLAGS = "$(CFLAGS) /I$(LUA_INCDIR)", - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)", - LUA_DIR = "$(LUADIR)", - BIN_DIR = "$(BINDIR)" - } - } - } -} diff --git a/3rdparty/luafilesystem/rockspecs/luafilesystem-cvs-2.rockspec b/3rdparty/luafilesystem/rockspecs/luafilesystem-cvs-2.rockspec deleted file mode 100644 index 651c7cf1317..00000000000 --- a/3rdparty/luafilesystem/rockspecs/luafilesystem-cvs-2.rockspec +++ /dev/null @@ -1,26 +0,0 @@ -package = "LuaFileSystem" - -version = "cvs-2" - -source = { - url = "git://github.com/keplerproject/luafilesystem.git", -} - -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} - -dependencies = { - "lua >= 5.1" -} - -build = { - type = "module", - modules = { lfs = "src/lfs.c" } -} diff --git a/3rdparty/luafilesystem/rockspecs/luafilesystem-cvs-3.rockspec b/3rdparty/luafilesystem/rockspecs/luafilesystem-cvs-3.rockspec deleted file mode 100644 index a4388cd7619..00000000000 --- a/3rdparty/luafilesystem/rockspecs/luafilesystem-cvs-3.rockspec +++ /dev/null @@ -1,27 +0,0 @@ -package = "LuaFileSystem" - -version = "cvs-3" - -source = { - url = "git://github.com/keplerproject/luafilesystem.git", -} - -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} - -dependencies = { - "lua >= 5.1, < 5.4" -} - -build = { - type = "builtin", - modules = { lfs = "src/lfs.c" }, - copy_directories = { "doc", "tests" } -} diff --git a/3rdparty/luafilesystem/src/lfs.c b/3rdparty/luafilesystem/src/lfs.c index 4eed5d99a9c..1b4ef09bfea 100644 --- a/3rdparty/luafilesystem/src/lfs.c +++ b/3rdparty/luafilesystem/src/lfs.c @@ -1,33 +1,37 @@ /* ** LuaFileSystem -** Copyright Kepler Project 2003 (http://www.keplerproject.org/luafilesystem) +** Copyright Kepler Project 2003 - 2020 +** (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 #ifndef _WIN32 #ifndef _AIX -#define _FILE_OFFSET_BITS 64 /* Linux, Solaris and HP-UX */ +#define _FILE_OFFSET_BITS 64 /* Linux, Solaris and HP-UX */ #else -#define _LARGE_FILES 1 /* AIX */ +#define _LARGE_FILES 1 /* AIX */ +#endif #endif #endif + +#ifdef _WIN32 +#define _WIN32_WINNT 0x600 #endif #ifndef LFS_DO_NOT_USE_LARGE_FILE @@ -42,28 +46,39 @@ #include <sys/stat.h> #ifdef _WIN32 + #include <direct.h> #include <windows.h> #include <io.h> #include <sys/locking.h> + #ifdef __BORLANDC__ - #include <utime.h> +#include <utime.h> #else - #include <sys/utime.h> +#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 <unistd.h> #include <dirent.h> #include <fcntl.h> #include <sys/types.h> #include <utime.h> -#endif +#include <sys/param.h> /* for MAXPATHLEN */ -#ifdef __GNU__ -#ifndef MAXPATHLEN -#define MAXPATHLEN 1024 +#ifdef MAXPATHLEN +#define LFS_MAXPATHLEN MAXPATHLEN +#else +#include <limits.h> /* for _POSIX_PATH_MAX */ +#define LFS_MAXPATHLEN _POSIX_PATH_MAX #endif + #endif #include <lua.h> @@ -72,10 +87,10 @@ #include "lfs.h" -#define LFS_VERSION "1.6.3" +#define LFS_VERSION "1.8.0" #define LFS_LIBNAME "lfs" -#if LUA_VERSION_NUM >= 503 /* Lua 5.3 */ +#if LUA_VERSION_NUM >= 503 /* Lua 5.3+ */ #ifndef luaL_optlong #define luaL_optlong luaL_optinteger @@ -83,8 +98,10 @@ #endif -#if LUA_VERSION_NUM < 502 -# define luaL_newlib(L,l) (lua_newtable(L), luaL_register(L,NULL,l)) +#if LUA_VERSION_NUM >= 502 +#define new_lib(L, l) (luaL_newlib(L, l)) +#else +#define new_lib(L, l) (lua_newtable(L), luaL_register(L, NULL, l)) #endif /* Define 'strerror' for systems that do not implement it */ @@ -92,91 +109,165 @@ #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; + int closed; #ifdef _WIN32 - intptr_t hFile; - char pattern[MAX_PATH+1]; + intptr_t hFile; + char pattern[MAX_PATH + 1]; #else - DIR *dir; + DIR *dir; #endif } dir_data; #define LOCK_METATABLE "lock metatable" #ifdef _WIN32 - #ifdef __BORLANDC__ - #define lfs_setmode(L,file,m) ((void)L, setmode(_fileno(file), m)) - #define STAT_STRUCT struct stati64 - #else - #define lfs_setmode(L,file,m) ((void)L, _setmode(_fileno(file), m)) - #define STAT_STRUCT struct _stati64 - #endif + +#ifdef __BORLANDC__ +#define lfs_setmode(file, m) (setmode(_fileno(file), m)) +#define STAT_STRUCT struct stati64 +#else +#define lfs_setmode(file, m) (_setmode(_fileno(file), m)) +#define STAT_STRUCT struct _stati64 +#endif + +#ifndef _S_IFLNK +#define _S_IFLNK 0x400 +#endif + +#ifndef S_ISDIR +#define S_ISDIR(mode) (mode&_S_IFDIR) +#endif +#ifndef S_ISREG +#define S_ISREG(mode) (mode&_S_IFREG) +#endif +#ifndef S_ISLNK +#define S_ISLNK(mode) (mode&_S_IFLNK) +#endif +#ifndef S_ISSOCK +#define S_ISSOCK(mode) (0) +#endif +#ifndef S_ISFIFO +#define S_ISFIFO(mode) (0) +#endif +#ifndef S_ISCHR +#define S_ISCHR(mode) (mode&_S_IFCHR) +#endif +#ifndef S_ISBLK +#define S_ISBLK(mode) (0) +#endif + #define STAT_FUNC _stati64 -#define LSTAT_FUNC STAT_FUNC +#define LSTAT_FUNC lfs_win32_lstat + #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 + +#ifdef _WIN32 + +int lfs_win32_pusherror(lua_State * L) +{ + int en = GetLastError(); + lua_pushnil(L); + if (en == ERROR_FILE_EXISTS || en == ERROR_SHARING_VIOLATION) + lua_pushstring(L, "File exists"); + else + lua_pushstring(L, strerror(en)); + return 2; +} + +#define TICKS_PER_SECOND 10000000 +#define EPOCH_DIFFERENCE 11644473600LL +time_t windowsToUnixTime(FILETIME ft) +{ + ULARGE_INTEGER uli; + uli.LowPart = ft.dwLowDateTime; + uli.HighPart = ft.dwHighDateTime; + return (time_t) (uli.QuadPart / TICKS_PER_SECOND - EPOCH_DIFFERENCE); +} + +int lfs_win32_lstat(const char *path, STAT_STRUCT * buffer) +{ + WIN32_FILE_ATTRIBUTE_DATA win32buffer; + if (GetFileAttributesEx(path, GetFileExInfoStandard, &win32buffer)) { + if (!(win32buffer.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) { + return STAT_FUNC(path, buffer); + } + buffer->st_mode = _S_IFLNK; + buffer->st_dev = 0; + buffer->st_ino = 0; + buffer->st_nlink = 0; + buffer->st_uid = 0; + buffer->st_gid = 0; + buffer->st_rdev = 0; + buffer->st_atime = windowsToUnixTime(win32buffer.ftLastAccessTime); + buffer->st_mtime = windowsToUnixTime(win32buffer.ftLastWriteTime); + buffer->st_ctime = windowsToUnixTime(win32buffer.ftCreationTime); + buffer->st_size = 0; + return 0; + } else { + return 1; + } +} + #endif /* ** Utility functions */ -static int pusherror(lua_State *L, const char *info) +static int pusherror(lua_State * L, const char *info) { - lua_pushnil(L); - if (info==NULL) - lua_pushstring(L, strerror(errno)); - else - lua_pushfstring(L, "%s: %s", info, strerror(errno)); - lua_pushinteger(L, errno); - return 3; + lua_pushnil(L); + if (info == NULL) + lua_pushstring(L, strerror(errno)); + else + lua_pushfstring(L, "%s: %s", info, strerror(errno)); + lua_pushinteger(L, errno); + return 3; } -#ifndef _WIN32 -static int pushresult(lua_State *L, int i, const char *info) +static int pushresult(lua_State * L, int res, const char *info) { - if (i==-1) - return pusherror(L, info); - lua_pushinteger(L, i); - return 1; + if (res == -1) { + return pusherror(L, info); + } else { + lua_pushboolean(L, 1); + return 1; + } } -#endif + + /* ** This function changes the working (current) directory */ -static int change_dir (lua_State *L) { - const char *path = luaL_checkstring(L, 1); - if (chdir(path)) { - lua_pushnil (L); - lua_pushfstring (L,"Unable to change working directory to '%s'\n%s\n", - path, chdir_error); - return 2; - } else { - lua_pushboolean (L, 1); - return 1; - } +static int change_dir(lua_State * L) +{ + const char *path = luaL_checkstring(L, 1); + if (chdir(path)) { + lua_pushnil(L); + lua_pushfstring(L, "Unable to change working directory to '%s'\n%s\n", + path, chdir_error); + return 2; + } else { + lua_pushboolean(L, 1); + return 1; + } } /* @@ -184,39 +275,62 @@ static int change_dir (lua_State *L) { ** If unable to get the current directory, it returns nil ** and a string describing the error */ -static int get_dir (lua_State *L) { - char *path; - /* 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); - return 2; - } - else { - lua_pushstring(L, path); - return 1; +static int get_dir(lua_State * L) +{ +#ifdef NO_GETCWD + lua_pushnil(L); + lua_pushstring(L, "Function 'getcwd' not provided by system"); + return 2; +#else + char *path = NULL; + /* Passing (NULL, 0) is not guaranteed to work. + Use a temp buffer and size instead. */ + size_t size = LFS_MAXPATHLEN; /* initial buffer size */ + int result; + while (1) { + char *path2 = (char *)realloc(path, size); + if (!path2) { /* failed to allocate */ + result = pusherror(L, "get_dir realloc() failed"); + break; + } + path = path2; + 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) { +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: 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; + FILE **fh = (FILE **) luaL_checkudata(L, idx, "FILE*"); + if (*fh == NULL) { + luaL_error(L, "%s: closed file", funcname); + return 0; + } else + return *fh; +#elif LUA_VERSION_NUM >= 502 && LUA_VERSION_NUM <= 504 + 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 @@ -226,90 +340,114 @@ static FILE *check_file (lua_State *L, int idx, const char *funcname) { /* ** */ -static int _file_lock (lua_State *L, FILE *fh, const char *mode, const long start, long len, const char *funcname) { - int code; +static int _file_lock(lua_State * L, FILE * fh, const char *mode, + const long start, long len, const char *funcname) +{ + int code; #ifdef _WIN32 - /* lkmode valid values are: - LK_LOCK Locks the specified bytes. If the bytes cannot be locked, the program immediately tries again after 1 second. If, after 10 attempts, the bytes cannot be locked, the constant returns an error. - LK_NBLCK Locks the specified bytes. If the bytes cannot be locked, the constant returns an error. - LK_NBRLCK Same as _LK_NBLCK. - LK_RLCK Same as _LK_LOCK. - LK_UNLCK Unlocks the specified bytes, which must have been previously locked. - - Regions should be locked only briefly and should be unlocked before closing a file or exiting the program. - - http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_crt__locking.asp - */ - int lkmode; - switch (*mode) { - case 'r': lkmode = LK_NBLCK; break; - case 'w': lkmode = LK_NBLCK; break; - case 'u': lkmode = LK_UNLCK; break; - default : return luaL_error (L, "%s: invalid mode", funcname); - } - if (!len) { - fseek (fh, 0L, SEEK_END); - len = ftell (fh); - } - fseek (fh, start, SEEK_SET); + /* lkmode valid values are: + LK_LOCK Locks the specified bytes. If the bytes cannot be locked, + the program immediately tries again after 1 second. + If, after 10 attempts, the bytes cannot be locked, + the constant returns an error. + LK_NBLCK Locks the specified bytes. If the bytes cannot be locked, + the constant returns an error. + LK_NBRLCK Same as _LK_NBLCK. + LK_RLCK Same as _LK_LOCK. + LK_UNLCK Unlocks the specified bytes, which must have been + previously locked. + + Regions should be locked only briefly and should be unlocked + before closing a file or exiting the program. + + http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_crt__locking.asp + */ + int lkmode; + switch (*mode) { + case 'r': + lkmode = LK_NBLCK; + break; + case 'w': + lkmode = LK_NBLCK; + break; + case 'u': + lkmode = LK_UNLCK; + break; + default: + return luaL_error(L, "%s: invalid mode", funcname); + } + if (!len) { + fseek(fh, 0L, SEEK_END); + len = ftell(fh); + } + fseek(fh, start, SEEK_SET); #ifdef __BORLANDC__ - code = locking (fileno(fh), lkmode, len); + code = locking(fileno(fh), lkmode, len); #else - code = _locking (fileno(fh), lkmode, len); + code = _locking(fileno(fh), lkmode, len); #endif #else - struct flock f; - switch (*mode) { - case 'w': f.l_type = F_WRLCK; break; - case 'r': f.l_type = F_RDLCK; break; - case 'u': f.l_type = F_UNLCK; break; - default : return luaL_error (L, "%s: invalid mode", funcname); - } - f.l_whence = SEEK_SET; - f.l_start = (off_t)start; - f.l_len = (off_t)len; - code = fcntl (fileno(fh), F_SETLK, &f); + struct flock f; + switch (*mode) { + case 'w': + f.l_type = F_WRLCK; + break; + case 'r': + f.l_type = F_RDLCK; + break; + case 'u': + f.l_type = F_UNLCK; + break; + default: + return luaL_error(L, "%s: invalid mode", funcname); + } + f.l_whence = SEEK_SET; + f.l_start = (off_t) start; + f.l_len = (off_t) len; + code = fcntl(fileno(fh), F_SETLK, &f); #endif - return (code != -1); + return (code != -1); } #ifdef _WIN32 typedef struct lfs_Lock { HANDLE fd; } lfs_Lock; -static int lfs_lock_dir(lua_State *L) { - size_t pathl; HANDLE fd; +static int lfs_lock_dir(lua_State * L) +{ + size_t pathl; + HANDLE fd; lfs_Lock *lock; char *ln; const char *lockfile = "/lockfile.lfs"; const char *path = luaL_checklstring(L, 1, &pathl); - ln = (char*)malloc(pathl + strlen(lockfile) + 1); - if(!ln) { - lua_pushnil(L); lua_pushstring(L, strerror(errno)); return 2; - } - strcpy(ln, path); strcat(ln, lockfile); - if((fd = CreateFileA(ln, GENERIC_WRITE, 0, NULL, CREATE_NEW, - FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, NULL)) == INVALID_HANDLE_VALUE) { - int en = GetLastError(); - free(ln); lua_pushnil(L); - if(en == ERROR_FILE_EXISTS || en == ERROR_SHARING_VIOLATION) - lua_pushstring(L, "File exists"); - else - lua_pushstring(L, strerror(en)); - return 2; + ln = (char *) malloc(pathl + strlen(lockfile) + 1); + if (!ln) { + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + return 2; } + strcpy(ln, path); + strcat(ln, lockfile); + fd = CreateFile(ln, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, NULL); free(ln); - lock = (lfs_Lock*)lua_newuserdata(L, sizeof(lfs_Lock)); + if (fd == INVALID_HANDLE_VALUE) { + return lfs_win32_pusherror(L); + } + lock = (lfs_Lock *) lua_newuserdata(L, sizeof(lfs_Lock)); lock->fd = fd; - luaL_getmetatable (L, LOCK_METATABLE); - lua_setmetatable (L, -2); + luaL_getmetatable(L, LOCK_METATABLE); + lua_setmetatable(L, -2); return 1; } -static int lfs_unlock_dir(lua_State *L) { - lfs_Lock *lock = (lfs_Lock *)luaL_checkudata(L, 1, LOCK_METATABLE); - if(lock->fd != INVALID_HANDLE_VALUE) { + +static int lfs_unlock_dir(lua_State * L) +{ + 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; + lock->fd = INVALID_HANDLE_VALUE; } return 0; } @@ -317,30 +455,38 @@ static int lfs_unlock_dir(lua_State *L) { typedef struct lfs_Lock { char *ln; } lfs_Lock; -static int lfs_lock_dir(lua_State *L) { +static int lfs_lock_dir(lua_State * L) +{ lfs_Lock *lock; size_t pathl; char *ln; const char *lockfile = "/lockfile.lfs"; const char *path = luaL_checklstring(L, 1, &pathl); - lock = (lfs_Lock*)lua_newuserdata(L, sizeof(lfs_Lock)); - ln = (char*)malloc(pathl + strlen(lockfile) + 1); - if(!ln) { - lua_pushnil(L); lua_pushstring(L, strerror(errno)); return 2; + lock = (lfs_Lock *) lua_newuserdata(L, sizeof(lfs_Lock)); + ln = (char *) malloc(pathl + strlen(lockfile) + 1); + if (!ln) { + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + return 2; } - strcpy(ln, path); strcat(ln, lockfile); - if(symlink("lock", ln) == -1) { - free(ln); lua_pushnil(L); - lua_pushstring(L, strerror(errno)); return 2; + strcpy(ln, path); + strcat(ln, lockfile); + if (symlink("lock", ln) == -1) { + free(ln); + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + return 2; } lock->ln = ln; - luaL_getmetatable (L, LOCK_METATABLE); - lua_setmetatable (L, -2); + luaL_getmetatable(L, LOCK_METATABLE); + lua_setmetatable(L, -2); return 1; } -static int lfs_unlock_dir(lua_State *L) { - lfs_Lock *lock = (lfs_Lock *)luaL_checkudata(L, 1, LOCK_METATABLE); - if(lock->ln) { + +static int lfs_unlock_dir(lua_State * L) +{ + lfs_Lock *lock = (lfs_Lock *) luaL_checkudata(L, 1, LOCK_METATABLE); + if (lock->ln) { unlink(lock->ln); free(lock->ln); lock->ln = NULL; @@ -349,33 +495,30 @@ static int lfs_unlock_dir(lua_State *L) { } #endif -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}; +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); } } -static int lfs_f_setmode(lua_State *L) { +static int lfs_f_setmode(lua_State * L) +{ return lfs_g_setmode(L, check_file(L, 1, "setmode"), 2); } @@ -386,19 +529,20 @@ static int lfs_f_setmode(lua_State *L) { ** @param #3 Number with start position (optional). ** @param #4 Number with length (optional). */ -static int file_lock (lua_State *L) { - FILE *fh = check_file (L, 1, "lock"); - const char *mode = luaL_checkstring (L, 2); - const long start = (long) luaL_optinteger (L, 3, 0); - long len = (long) luaL_optinteger (L, 4, 0); - if (_file_lock (L, fh, mode, start, len, "lock")) { - lua_pushboolean (L, 1); - return 1; - } else { - lua_pushnil (L); - lua_pushfstring (L, "%s", strerror(errno)); - return 2; - } +static int file_lock(lua_State * L) +{ + FILE *fh = check_file(L, 1, "lock"); + const char *mode = luaL_checkstring(L, 2); + const long start = (long) luaL_optinteger(L, 3, 0); + long len = (long) luaL_optinteger(L, 4, 0); + if (_file_lock(L, fh, mode, start, len, "lock")) { + lua_pushboolean(L, 1); + return 1; + } else { + lua_pushnil(L); + lua_pushfstring(L, "%s", strerror(errno)); + return 2; + } } @@ -408,18 +552,19 @@ static int file_lock (lua_State *L) { ** @param #2 Number with start position (optional). ** @param #3 Number with length (optional). */ -static int file_unlock (lua_State *L) { - FILE *fh = check_file (L, 1, "unlock"); - const long start = (long) luaL_optinteger (L, 2, 0); - long len = (long) luaL_optinteger (L, 3, 0); - if (_file_lock (L, fh, "u", start, len, "unlock")) { - lua_pushboolean (L, 1); - return 1; - } else { - lua_pushnil (L); - lua_pushfstring (L, "%s", strerror(errno)); - return 2; - } +static int file_unlock(lua_State * L) +{ + FILE *fh = check_file(L, 1, "unlock"); + const long start = (long) luaL_optinteger(L, 2, 0); + long len = (long) luaL_optinteger(L, 3, 0); + if (_file_lock(L, fh, "u", start, len, "unlock")) { + lua_pushboolean(L, 1); + return 1; + } else { + lua_pushnil(L); + lua_pushfstring(L, "%s", strerror(errno)); + return 2; + } } @@ -429,15 +574,40 @@ 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) { + const char *oldpath = luaL_checkstring(L, 1); + const char *newpath = luaL_checkstring(L, 2); #ifndef _WIN32 - const char *oldpath = luaL_checkstring(L, 1); - const char *newpath = luaL_checkstring(L, 2); - return pushresult(L, - (lua_toboolean(L,3) ? symlink : link)(oldpath, newpath), NULL); + return pushresult(L, + (lua_toboolean(L, 3) ? symlink : link) (oldpath, + newpath), + NULL); #else - return pusherror(L, "make_link is not supported on Windows"); + int symbolic = lua_toboolean(L, 3); + STAT_STRUCT oldpathinfo; + int is_dir = 0; + if (STAT_FUNC(oldpath, &oldpathinfo) == 0) { + is_dir = S_ISDIR(oldpathinfo.st_mode) != 0; + } + if (!symbolic && is_dir) { + lua_pushnil(L); + lua_pushstring(L, + "hard links to directories are not supported on Windows"); + return 2; + } + + int result = symbolic ? CreateSymbolicLink(newpath, oldpath, is_dir) + : CreateHardLink(newpath, oldpath, NULL); + + if (result) { + return pushresult(L, result, NULL); + } else { + lua_pushnil(L); + lua_pushstring(L, symbolic ? "make_link CreateSymbolicLink() failed" + : "make_link CreateHardLink() failed"); + return 2; + } #endif } @@ -446,22 +616,10 @@ static int make_link(lua_State *L) ** Creates a directory. ** @param #1 Directory path. */ -static int make_dir (lua_State *L) { - const char *path = luaL_checkstring (L, 1); - int fail; -#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; +static int make_dir(lua_State * L) +{ + const char *path = luaL_checkstring(L, 1); + return pushresult(L, lfs_mkdir(path), NULL); } @@ -469,65 +627,57 @@ static int make_dir (lua_State *L) { ** 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; +static int remove_dir(lua_State * L) +{ + const char *path = luaL_checkstring(L, 1); + return pushresult(L, rmdir(path), NULL); } /* ** Directory iterator */ -static int dir_iter (lua_State *L) { +static int dir_iter(lua_State * L) +{ #ifdef _WIN32 - struct _finddata_t c_file; + struct _finddata_t c_file; #else - struct dirent *entry; + struct dirent *entry; #endif - dir_data *d = (dir_data *)luaL_checkudata (L, 1, DIR_METATABLE); - luaL_argcheck (L, d->closed == 0, 1, "closed directory"); + dir_data *d = (dir_data *) luaL_checkudata(L, 1, DIR_METATABLE); + luaL_argcheck(L, d->closed == 0, 1, "closed directory"); #ifdef _WIN32 - if (d->hFile == 0L) { /* first entry */ - if ((d->hFile = _findfirst (d->pattern, &c_file)) == -1L) { - lua_pushnil (L); - lua_pushstring (L, strerror (errno)); - d->closed = 1; - return 2; - } else { - lua_pushstring (L, c_file.name); - return 1; - } - } else { /* next entry */ - if (_findnext (d->hFile, &c_file) == -1L) { - /* no more entries => close directory */ - _findclose (d->hFile); - d->closed = 1; - return 0; - } else { - lua_pushstring (L, c_file.name); - return 1; - } - } + if (d->hFile == 0L) { /* first entry */ + if ((d->hFile = _findfirst(d->pattern, &c_file)) == -1L) { + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + d->closed = 1; + return 2; + } else { + lua_pushstring(L, c_file.name); + return 1; + } + } else { /* next entry */ + if (_findnext(d->hFile, &c_file) == -1L) { + /* no more entries => close directory */ + _findclose(d->hFile); + d->closed = 1; + return 0; + } else { + lua_pushstring(L, c_file.name); + return 1; + } + } #else - if ((entry = readdir (d->dir)) != NULL) { - lua_pushstring (L, entry->d_name); - return 1; - } else { - /* no more entries => close directory */ - closedir (d->dir); - d->closed = 1; - return 0; - } + if ((entry = readdir(d->dir)) != NULL) { + lua_pushstring(L, entry->d_name); + return 1; + } else { + /* no more entries => close directory */ + closedir(d->dir); + d->closed = 1; + return 0; + } #endif } @@ -535,378 +685,498 @@ static int dir_iter (lua_State *L) { /* ** Closes directory iterators */ -static int dir_close (lua_State *L) { - dir_data *d = (dir_data *)lua_touserdata (L, 1); +static int dir_close(lua_State * L) +{ + dir_data *d = (dir_data *) lua_touserdata(L, 1); #ifdef _WIN32 - if (!d->closed && d->hFile) { - _findclose (d->hFile); - } + if (!d->closed && d->hFile) { + _findclose(d->hFile); + } #else - if (!d->closed && d->dir) { - closedir (d->dir); - } + if (!d->closed && d->dir) { + closedir(d->dir); + } #endif - d->closed = 1; - return 0; + d->closed = 1; + return 0; } /* ** Factory of directory iterators */ -static int dir_iter_factory (lua_State *L) { - const char *path = luaL_checkstring (L, 1); - dir_data *d; - lua_pushcfunction (L, dir_iter); - d = (dir_data *) lua_newuserdata (L, sizeof(dir_data)); - luaL_getmetatable (L, DIR_METATABLE); - lua_setmetatable (L, -2); - d->closed = 0; +static int dir_iter_factory(lua_State * L) +{ + const char *path = luaL_checkstring(L, 1); + dir_data *d; + lua_pushcfunction(L, dir_iter); + d = (dir_data *) lua_newuserdata(L, sizeof(dir_data)); + luaL_getmetatable(L, DIR_METATABLE); + lua_setmetatable(L, -2); + d->closed = 0; #ifdef _WIN32 - d->hFile = 0L; - if (strlen(path) > MAX_PATH-2) - luaL_error (L, "path too long: %s", path); - else - sprintf (d->pattern, "%s/*", path); + d->hFile = 0L; + if (strlen(path) > MAX_PATH - 2) + luaL_error(L, "path too long: %s", path); + else + sprintf(d->pattern, "%s/*", path); #else - d->dir = opendir (path); - if (d->dir == NULL) - luaL_error (L, "cannot open %s: %s", path, strerror (errno)); + d->dir = opendir(path); + if (d->dir == NULL) + luaL_error(L, "cannot open %s: %s", path, strerror(errno)); +#endif +#if LUA_VERSION_NUM >= 504 + lua_pushnil(L); + lua_pushvalue(L, -2); + return 4; +#else + return 2; #endif - return 2; } /* ** Creates directory metatable. */ -static int dir_create_meta (lua_State *L) { - luaL_newmetatable (L, DIR_METATABLE); - - /* Method table */ - lua_newtable(L); - lua_pushcfunction (L, dir_iter); - lua_setfield(L, -2, "next"); - lua_pushcfunction (L, dir_close); - lua_setfield(L, -2, "close"); - - /* Metamethods */ - lua_setfield(L, -2, "__index"); - lua_pushcfunction (L, dir_close); - lua_setfield (L, -2, "__gc"); - return 1; +static int dir_create_meta(lua_State * L) +{ + luaL_newmetatable(L, DIR_METATABLE); + + /* Method table */ + lua_newtable(L); + lua_pushcfunction(L, dir_iter); + lua_setfield(L, -2, "next"); + lua_pushcfunction(L, dir_close); + lua_setfield(L, -2, "close"); + + /* Metamethods */ + lua_setfield(L, -2, "__index"); + lua_pushcfunction(L, dir_close); + lua_setfield(L, -2, "__gc"); + +#if LUA_VERSION_NUM >= 504 + lua_pushcfunction(L, dir_close); + lua_setfield(L, -2, "__close"); +#endif + return 1; } /* ** Creates lock metatable. */ -static int lock_create_meta (lua_State *L) { - luaL_newmetatable (L, LOCK_METATABLE); - - /* Method table */ - lua_newtable(L); - lua_pushcfunction(L, lfs_unlock_dir); - lua_setfield(L, -2, "free"); - - /* Metamethods */ - lua_setfield(L, -2, "__index"); - lua_pushcfunction(L, lfs_unlock_dir); - lua_setfield(L, -2, "__gc"); - return 1; +static int lock_create_meta(lua_State * L) +{ + luaL_newmetatable(L, LOCK_METATABLE); + + /* Method table */ + lua_newtable(L); + lua_pushcfunction(L, lfs_unlock_dir); + lua_setfield(L, -2, "free"); + + /* Metamethods */ + lua_setfield(L, -2, "__index"); + lua_pushcfunction(L, lfs_unlock_dir); + lua_setfield(L, -2, "__gc"); + return 1; } -#ifdef _WIN32 - #ifndef S_ISDIR - #define S_ISDIR(mode) (mode&_S_IFDIR) - #endif - #ifndef S_ISREG - #define S_ISREG(mode) (mode&_S_IFREG) - #endif - #ifndef S_ISLNK - #define S_ISLNK(mode) (0) - #endif - #ifndef S_ISSOCK - #define S_ISSOCK(mode) (0) - #endif - #ifndef S_ISFIFO - #define S_ISFIFO(mode) (0) - #endif - #ifndef S_ISCHR - #define S_ISCHR(mode) (mode&_S_IFCHR) - #endif - #ifndef S_ISBLK - #define S_ISBLK(mode) (0) - #endif -#endif /* ** Convert the inode protection mode to a string. */ #ifdef _WIN32 -static const char *mode2string (unsigned short mode) { +static const char *mode2string(unsigned short mode) +{ #else -static const char *mode2string (mode_t mode) { +static const char *mode2string(mode_t mode) +{ #endif - if ( S_ISREG(mode) ) + if (S_ISREG(mode)) return "file"; - else if ( S_ISDIR(mode) ) + else if (S_ISDIR(mode)) return "directory"; - else if ( S_ISLNK(mode) ) - return "link"; - else if ( S_ISSOCK(mode) ) + else if (S_ISLNK(mode)) + return "link"; + else if (S_ISSOCK(mode)) return "socket"; - else if ( S_ISFIFO(mode) ) - return "named pipe"; - else if ( S_ISCHR(mode) ) - return "char device"; - else if ( S_ISBLK(mode) ) - return "block device"; + else if (S_ISFIFO(mode)) + return "named pipe"; + else if (S_ISCHR(mode)) + return "char device"; + else if (S_ISBLK(mode)) + return "block device"; else - return "other"; + return "other"; } /* -** 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); - struct utimbuf utb, *buf; - - if (lua_gettop (L) == 1) /* set to current date/time */ - buf = NULL; - else { - utb.actime = luaL_optnumber (L, 2, 0); - utb.modtime = (time_t) luaL_optinteger (L, 3, utb.actime); - buf = &utb; - } - if (utime (file, buf)) { - lua_pushnil (L); - lua_pushfstring (L, "%s", strerror (errno)); - return 2; - } - lua_pushboolean (L, 1); - return 1; +static int file_utime(lua_State * L) +{ + const char *file = luaL_checkstring(L, 1); + struct utimbuf utb, *buf; + + if (lua_gettop(L) == 1) /* set to current date/time */ + buf = NULL; + else { + utb.actime = (time_t) luaL_optnumber(L, 2, 0); + utb.modtime = (time_t) luaL_optinteger(L, 3, utb.actime); + buf = &utb; + } + + return pushresult(L, utime(file, buf), NULL); } /* inode protection mode */ -static void push_st_mode (lua_State *L, STAT_STRUCT *info) { - lua_pushstring (L, mode2string (info->st_mode)); +static void push_st_mode(lua_State * L, STAT_STRUCT * info) +{ + lua_pushstring(L, mode2string(info->st_mode)); } + /* device inode resides on */ -static void push_st_dev (lua_State *L, STAT_STRUCT *info) { - lua_pushinteger (L, (lua_Integer) info->st_dev); +static void push_st_dev(lua_State * L, STAT_STRUCT * info) +{ + lua_pushinteger(L, (lua_Integer) info->st_dev); } + /* inode's number */ -static void push_st_ino (lua_State *L, STAT_STRUCT *info) { - lua_pushinteger (L, (lua_Integer) info->st_ino); +static void push_st_ino(lua_State * L, STAT_STRUCT * info) +{ + lua_pushinteger(L, (lua_Integer) info->st_ino); } + /* number of hard links to the file */ -static void push_st_nlink (lua_State *L, STAT_STRUCT *info) { - lua_pushinteger (L, (lua_Integer)info->st_nlink); +static void push_st_nlink(lua_State * L, STAT_STRUCT * info) +{ + lua_pushinteger(L, (lua_Integer) info->st_nlink); } + /* user-id of owner */ -static void push_st_uid (lua_State *L, STAT_STRUCT *info) { - lua_pushinteger (L, (lua_Integer)info->st_uid); +static void push_st_uid(lua_State * L, STAT_STRUCT * info) +{ + lua_pushinteger(L, (lua_Integer) info->st_uid); } + /* group-id of owner */ -static void push_st_gid (lua_State *L, STAT_STRUCT *info) { - lua_pushinteger (L, (lua_Integer)info->st_gid); +static void push_st_gid(lua_State * L, STAT_STRUCT * info) +{ + lua_pushinteger(L, (lua_Integer) info->st_gid); } + /* device type, for special file inode */ -static void push_st_rdev (lua_State *L, STAT_STRUCT *info) { - lua_pushinteger (L, (lua_Integer) info->st_rdev); +static void push_st_rdev(lua_State * L, STAT_STRUCT * info) +{ + lua_pushinteger(L, (lua_Integer) info->st_rdev); } + /* time of last access */ -static void push_st_atime (lua_State *L, STAT_STRUCT *info) { - lua_pushinteger (L, (lua_Integer) info->st_atime); +static void push_st_atime(lua_State * L, STAT_STRUCT * info) +{ + lua_pushinteger(L, (lua_Integer) info->st_atime); } + /* time of last data modification */ -static void push_st_mtime (lua_State *L, STAT_STRUCT *info) { - lua_pushinteger (L, (lua_Integer) info->st_mtime); +static void push_st_mtime(lua_State * L, STAT_STRUCT * info) +{ + lua_pushinteger(L, (lua_Integer) info->st_mtime); } + /* time of last file status change */ -static void push_st_ctime (lua_State *L, STAT_STRUCT *info) { - lua_pushinteger (L, (lua_Integer) info->st_ctime); +static void push_st_ctime(lua_State * L, STAT_STRUCT * info) +{ + lua_pushinteger(L, (lua_Integer) info->st_ctime); } + /* file size, in bytes */ -static void push_st_size (lua_State *L, STAT_STRUCT *info) { - lua_pushinteger (L, (lua_Integer)info->st_size); +static void push_st_size(lua_State * L, STAT_STRUCT * info) +{ + lua_pushinteger(L, (lua_Integer) info->st_size); } + #ifndef _WIN32 /* blocks allocated for file */ -static void push_st_blocks (lua_State *L, STAT_STRUCT *info) { - lua_pushinteger (L, (lua_Integer)info->st_blocks); +static void push_st_blocks(lua_State * L, STAT_STRUCT * info) +{ + lua_pushinteger(L, (lua_Integer) info->st_blocks); } + /* optimal file system I/O blocksize */ -static void push_st_blksize (lua_State *L, STAT_STRUCT *info) { - lua_pushinteger (L, (lua_Integer)info->st_blksize); +static void push_st_blksize(lua_State * L, STAT_STRUCT * info) +{ + lua_pushinteger(L, (lua_Integer) info->st_blksize); } #endif /* -** Convert the inode protection mode to a permission list. -*/ + ** Convert the inode protection mode to a permission list. + */ #ifdef _WIN32 -static const char *perm2string (unsigned short mode) { +static const char *perm2string(unsigned short mode) +{ static char perms[10] = "---------"; int i; - for (i=0;i<9;i++) perms[i]='-'; - if (mode & _S_IREAD) - { perms[0] = 'r'; perms[3] = 'r'; perms[6] = 'r'; } - if (mode & _S_IWRITE) - { perms[1] = 'w'; perms[4] = 'w'; perms[7] = 'w'; } - if (mode & _S_IEXEC) - { perms[2] = 'x'; perms[5] = 'x'; perms[8] = 'x'; } + for (i = 0; i < 9; i++) + perms[i] = '-'; + if (mode & _S_IREAD) { + perms[0] = 'r'; + perms[3] = 'r'; + perms[6] = 'r'; + } + if (mode & _S_IWRITE) { + perms[1] = 'w'; + perms[4] = 'w'; + perms[7] = 'w'; + } + if (mode & _S_IEXEC) { + perms[2] = 'x'; + perms[5] = 'x'; + perms[8] = 'x'; + } return perms; } #else -static const char *perm2string (mode_t mode) { +static const char *perm2string(mode_t mode) +{ static char perms[10] = "---------"; int i; - for (i=0;i<9;i++) perms[i]='-'; - if (mode & S_IRUSR) perms[0] = 'r'; - if (mode & S_IWUSR) perms[1] = 'w'; - if (mode & S_IXUSR) perms[2] = 'x'; - if (mode & S_IRGRP) perms[3] = 'r'; - if (mode & S_IWGRP) perms[4] = 'w'; - if (mode & S_IXGRP) perms[5] = 'x'; - if (mode & S_IROTH) perms[6] = 'r'; - if (mode & S_IWOTH) perms[7] = 'w'; - if (mode & S_IXOTH) perms[8] = 'x'; + for (i = 0; i < 9; i++) + perms[i] = '-'; + if (mode & S_IRUSR) + perms[0] = 'r'; + if (mode & S_IWUSR) + perms[1] = 'w'; + if (mode & S_IXUSR) + perms[2] = 'x'; + if (mode & S_IRGRP) + perms[3] = 'r'; + if (mode & S_IWGRP) + perms[4] = 'w'; + if (mode & S_IXGRP) + perms[5] = 'x'; + if (mode & S_IROTH) + perms[6] = 'r'; + if (mode & S_IWOTH) + perms[7] = 'w'; + if (mode & S_IXOTH) + perms[8] = 'x'; return perms; } #endif /* permssions string */ -static void push_st_perm (lua_State *L, STAT_STRUCT *info) { - lua_pushstring (L, perm2string (info->st_mode)); +static void push_st_perm(lua_State * L, STAT_STRUCT * info) +{ + lua_pushstring(L, perm2string(info->st_mode)); } -typedef void (*_push_function) (lua_State *L, STAT_STRUCT *info); +typedef void (*_push_function)(lua_State * L, STAT_STRUCT * info); struct _stat_members { - const char *name; - _push_function push; + 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 }, - { "permissions", push_st_perm }, + { "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 }, + { "permissions", push_st_perm }, #ifndef _WIN32 - { "blocks", push_st_blocks }, - { "blksize", push_st_blksize }, + { "blocks", push_st_blocks }, + { "blksize", push_st_blksize }, #endif - { NULL, NULL } + { NULL, NULL } }; /* ** Get file or symbolic link information */ -static int _file_info_ (lua_State *L, int (*st)(const char*, STAT_STRUCT*)) { - STAT_STRUCT info; - const char *file = luaL_checkstring (L, 1); - int i; - - if (st(file, &info)) { - lua_pushnil (L); - lua_pushfstring (L, "cannot obtain information from file `%s'", file); - return 2; - } - if (lua_isstring (L, 2)) { - const char *member = lua_tostring (L, 2); - for (i = 0; members[i].name; i++) { - if (strcmp(members[i].name, member) == 0) { - /* push member value and return */ - members[i].push (L, &info); - return 1; - } - } - /* member not found */ - return luaL_error(L, "invalid attribute name"); - } - /* creates a table if none is given */ - if (!lua_istable (L, 2)) { - 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); - } +static int _file_info_(lua_State * L, + int (*st)(const char *, STAT_STRUCT *)) +{ + STAT_STRUCT info; + const char *file = luaL_checkstring(L, 1); + int i; + + if (st(file, &info)) { + lua_pushnil(L); + lua_pushfstring(L, "cannot obtain information from file '%s': %s", + file, strerror(errno)); + lua_pushinteger(L, errno); + return 3; + } + if (lua_isstring(L, 2)) { + const char *member = lua_tostring(L, 2); + for (i = 0; members[i].name; i++) { + if (strcmp(members[i].name, member) == 0) { + /* push member value and return */ + members[i].push(L, &info); return 1; + } + } + /* member not found */ + return luaL_error(L, "invalid attribute name '%s'", member); + } + /* creates a table if none is given, removes extra arguments */ + lua_settop(L, 2); + if (!lua_istable(L, 2)) { + lua_newtable(L); + } + /* stores all members in table on top of the stack */ + for (i = 0; members[i].name; i++) { + lua_pushstring(L, members[i].name); + members[i].push(L, &info); + lua_rawset(L, -3); + } + return 1; } /* ** Get file information using stat. */ -static int file_info (lua_State *L) { - return _file_info_ (L, STAT_FUNC); +static int file_info(lua_State * L) +{ + return _file_info_(L, STAT_FUNC); } /* +** 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) +{ + const char *file = luaL_checkstring(L, 1); +#ifdef _WIN32 + HANDLE h = CreateFile(file, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (h == INVALID_HANDLE_VALUE) { + return lfs_win32_pusherror(L); + } +#endif + char *target = NULL; + int tsize, size = 256; /* size = initial buffer capacity */ + int ok = 0; + while (!ok) { + char *target2 = (char *)realloc(target, size); + if (!target2) { /* failed to allocate */ + break; + } + target = target2; +#ifdef _WIN32 + tsize = GetFinalPathNameByHandle(h, target, size, FILE_NAME_OPENED); +#else + tsize = readlink(file, target, size); +#endif + if (tsize < 0) { /* a readlink() error occurred */ + break; + } + if (tsize < size) { +#ifdef _WIN32 + if (tsize > 4 && strncmp(target, "\\\\?\\", 4) == 0) { + memmove_s(target, tsize - 3, target + 4, tsize - 3); + tsize -= 4; + } +#endif + ok = 1; + break; + } + /* possibly truncated readlink() result, double size and retry */ + size *= 2; + } + if (ok) { + target[tsize] = '\0'; + lua_pushlstring(L, target, tsize); + } +#ifdef _WIN32 + CloseHandle(h); +#endif + free(target); + return ok; +} + +/* ** Get symbolic link information using lstat. */ -static int link_info (lua_State *L) { - return _file_info_ (L, LSTAT_FUNC); +static int link_info(lua_State * L) +{ + 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; } /* ** 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); +static void set_info(lua_State * L) +{ + lua_pushliteral(L, "Copyright (C) 2003-2017 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"); } static const struct luaL_Reg fslib[] = { - {"attributes", file_info}, - {"chdir", change_dir}, - {"currentdir", get_dir}, - {"dir", dir_iter_factory}, - {"link", make_link}, - {"lock", file_lock}, - {"mkdir", make_dir}, - {"rmdir", remove_dir}, - {"symlinkattributes", link_info}, - {"setmode", lfs_f_setmode}, - {"touch", file_utime}, - {"unlock", file_unlock}, - {"lock_dir", lfs_lock_dir}, - {NULL, NULL}, + { "attributes", file_info }, + { "chdir", change_dir }, + { "currentdir", get_dir }, + { "dir", dir_iter_factory }, + { "link", make_link }, + { "lock", file_lock }, + { "mkdir", make_dir }, + { "rmdir", remove_dir }, + { "symlinkattributes", link_info }, + { "setmode", lfs_f_setmode }, + { "touch", file_utime }, + { "unlock", file_unlock }, + { "lock_dir", lfs_lock_dir }, + { NULL, NULL }, }; -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; +LFS_EXPORT int luaopen_lfs(lua_State * L) +{ + dir_create_meta(L); + lock_create_meta(L); + new_lib(L, fslib); + lua_pushvalue(L, -1); + lua_setglobal(L, LFS_LIBNAME); + set_info(L); + return 1; } diff --git a/3rdparty/luafilesystem/src/lfs.def b/3rdparty/luafilesystem/src/lfs.def index 6c782eb6968..beff2c7e141 100644 --- a/3rdparty/luafilesystem/src/lfs.def +++ b/3rdparty/luafilesystem/src/lfs.def @@ -1,4 +1,4 @@ LIBRARY lfs.dll -VERSION 1.6 +VERSION 1.8 EXPORTS luaopen_lfs diff --git a/3rdparty/luafilesystem/src/lfs.h b/3rdparty/luafilesystem/src/lfs.h index ea1720dba75..13b60a9197a 100644 --- a/3rdparty/luafilesystem/src/lfs.h +++ b/3rdparty/luafilesystem/src/lfs.h @@ -1,8 +1,7 @@ /* ** 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 - 2020 +** (http://keplerproject.github.io/luafilesystem) */ /* Define 'chdir' for systems that do not implement it */ @@ -11,23 +10,25 @@ #define chdir_error "Function 'chdir' not provided by system" #else #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 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 } diff --git a/3rdparty/luafilesystem/tests/test.lua b/3rdparty/luafilesystem/tests/test.lua index abfbd4d9690..ed154c09362 100644 --- a/3rdparty/luafilesystem/tests/test.lua +++ b/3rdparty/luafilesystem/tests/test.lua @@ -4,6 +4,8 @@ local tmp = "/tmp" local sep = string.match (package.config, "[^\n]+") local upper = ".." +local is_unix = package.config:sub(1,1) == "/" + local lfs = require"lfs" print (lfs._VERSION) @@ -60,6 +62,8 @@ if not attrib then error ("could not get attributes of file `"..tmpdir.."':\n"..errmsg) end local f = io.open(tmpfile, "w") +local data = "hello, file!" +f:write(data) f:close() io.write(".") @@ -87,12 +91,42 @@ assert (new_att.modification == testdate1, "could not set modification time") io.write(".") io.flush() --- Checking link (does not work on Windows) 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.symlinkattributes(tmpfile).mode == "file") + assert (lfs.link (tmpfile, "_a_hard_link_for_test_")) - assert (lfs.attributes (tmpfile, "nlink") == 2) + assert (lfs.symlinkattributes"_a_hard_link_for_test_".mode == "file") + + local fd = io.open(tmpfile) + assert(fd:read("*a") == data) + fd:close() + + fd = io.open("_a_link_for_test_") + assert(fd:read("*a") == data) + fd:close() + + fd = io.open("_a_hard_link_for_test_") + assert(fd:read("*a") == data) + fd:close() + + fd = io.open("_a_hard_link_for_test_", "w+") + local data2 = "write in hard link" + fd:write(data2) + fd:close() + + fd = io.open(tmpfile) + assert(fd:read("*a") == data2) + fd:close() + + if is_unix then + assert (lfs.attributes (tmpfile, "nlink") == 2) + end + assert (os.remove"_a_link_for_test_") assert (os.remove"_a_hard_link_for_test_") end @@ -107,6 +141,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 +164,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 +184,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(".") |