From f100e939b3262ac391fe767d591d1a316ab59f3a Mon Sep 17 00:00:00 2001 From: Luigi Scarso Date: Wed, 17 Jan 2018 18:00:12 +0000 Subject: Luatex 1.07 --- luatex and luatex53 git-svn-id: svn://tug.org/texlive/trunk@46348 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/web2c/luatexdir/luafilesystem/LICENSE | 21 + .../texk/web2c/luatexdir/luafilesystem/Makefile | 9 +- .../texk/web2c/luatexdir/luafilesystem/README | 66 -- .../texk/web2c/luatexdir/luafilesystem/README.md | 28 + .../web2c/luatexdir/luafilesystem/doc/us/doc.css | 209 +++++ .../luatexdir/luafilesystem/doc/us/examples.html | 14 +- .../luatexdir/luafilesystem/doc/us/index.html | 90 +- .../luatexdir/luafilesystem/doc/us/license.html | 16 +- .../luatexdir/luafilesystem/doc/us/manual.html | 65 +- .../texk/web2c/luatexdir/luafilesystem/src/lfs.c | 937 ++++++++++++--------- .../texk/web2c/luatexdir/luafilesystem/src/lfs.def | 3 +- .../texk/web2c/luatexdir/luafilesystem/src/lfs.h | 31 +- .../web2c/luatexdir/luafilesystem/tests/test.lua | 146 +++- 13 files changed, 1022 insertions(+), 613 deletions(-) create mode 100644 Build/source/texk/web2c/luatexdir/luafilesystem/LICENSE delete mode 100644 Build/source/texk/web2c/luatexdir/luafilesystem/README create mode 100644 Build/source/texk/web2c/luatexdir/luafilesystem/README.md create mode 100644 Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/doc.css (limited to 'Build/source/texk/web2c/luatexdir/luafilesystem') diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/LICENSE b/Build/source/texk/web2c/luatexdir/luafilesystem/LICENSE new file mode 100644 index 00000000000..8475345a64e --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/LICENSE @@ -0,0 +1,21 @@ +Copyright © 2003-2014 Kepler Project. + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, copy, +modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/Makefile b/Build/source/texk/web2c/luatexdir/luafilesystem/Makefile index 6b54f2c779d..dfc1a8a33c4 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/Makefile +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/Makefile @@ -12,11 +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="10.3"; 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/Build/source/texk/web2c/luatexdir/luafilesystem/README b/Build/source/texk/web2c/luatexdir/luafilesystem/README deleted file mode 100644 index 0103efa6421..00000000000 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/README +++ /dev/null @@ -1,66 +0,0 @@ -LuaFileSystem - File System Library for Lua -Copyright 2003 Kepler Project -http://www.keplerproject.org/luafilesystem - -Description ------------ -LuaFileSystem is a Lua library developed to complement the set of functions -related to file systems offered by the standard Lua distribution. - -LuaFileSystem offers a portable way to access the underlying directory structure and file attributes. -LuaFileSystem is free software and uses the same license as Lua 5.1 - -LuaRocks Installation ---------------------- -luarocks install luafilesystem - - -Documentation -------------- -Please check the documentation at doc/us/ for more information. - -History -------- - -Version 1.5.0 [20/Oct/2009] - * added explicit next and close methods to second return value of lfs.dir (the directory object), for explicit iteration or explicit closing. - * added directory locking via lfs.lock_dir function (see the manual). - -Version 1.4.2 [03/Feb/2009] - - * fixed bug [#13198] lfs.attributes(filename, 'size') overflow on files > 2 Gb again (bug report and patch by KUBO Takehiro). - * fixed bug [#39794] Compile error on Solaris 10 (bug report and patch by Aaron B). - * fixed compilation problems with Borland C. - -Version 1.4.1 [07/May/2008] - - * documentation review - * fixed Windows compilation issues - * fixed bug in the Windows tests (patch by Shmuel Zeigerman) - * fixed bug [#2185] lfs.attributes(filename, 'size') overflow on files > 2 Gb - -Version 1.4.0 [13/Feb/2008] - - * added function lfs.setmode (works only in Windows systems). - * lfs.attributes raises an error if attribute does not exist - -Version 1.3.0 [26/Oct/2007] - - * added function lfs.symlinkattributes (works only in non Windows systems). - -Version 1.2.1 [08/May/2007] - - * compatible only with Lua 5.1 (Lua 5.0 support was dropped) - -Version 1.2 [15/Mar/2006] - - * added optional argument to lfs.attributes - * added function lfs.rmdir - * bug correction on lfs.dir - -Version 1.1 [30/May/2005] - - * added function lfs.touch. - -Version 1.0 [21/Jan/2005] -Version 1.0 Beta [10/Nov/2004] diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/README.md b/Build/source/texk/web2c/luatexdir/luafilesystem/README.md new file mode 100644 index 00000000000..ee493738052 --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/README.md @@ -0,0 +1,28 @@ +[![License](http://img.shields.io/badge/Licence-MIT-brightgreen.svg)](LICENSE) +[![Build Status](https://travis-ci.org/keplerproject/luafilesystem.svg?branch=master)](https://travis-ci.org/keplerproject/luafilesystem) +[![Build status](https://ci.appveyor.com/api/projects/status/y04s4ms7u16trw8e?svg=true)](https://ci.appveyor.com/project/ignacio/luafilesystem) +[![Coverage Status](https://coveralls.io/repos/keplerproject/luafilesystem/badge.png)](https://coveralls.io/r/keplerproject/luafilesystem) + +# LuaFileSystem - File System Library for Lua + +Copyright 2003-2017 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/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/doc.css b/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/doc.css new file mode 100644 index 00000000000..f233ce4f089 --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/doc.css @@ -0,0 +1,209 @@ +body { + 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: "Open Sans Mono", "Andale Mono", monospace; +} + +tt { + font-family: "Open Sans Mono", "Andale Mono", monospace; +} + +body, td, th { +} + +textarea, pre, tt { + font-family: "Open Sans Mono", "Andale Mono", monospace; +} + +img { + border-width: 0px; +} + +.example { + background-color: #323744; + color: white; + font-size: 16px; + padding: 16px 24px; + border-radius: 2px; +} + +div.header, div.footer { +} + +#container { +} + +#product { + background-color: white; + padding: 10px; + height: 130px; + border-bottom: solid #d3dbec 1px; +} + +#product big { + 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: #eff4ff; + margin: 0; +} + +#navigation { + width: 100%; + background-color: rgb(44,62,103); + padding: 10px; + margin: 0; +} + +#navigation h1 { + 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 { + display: inline; + color: white; + padding: 0px; + padding-top: 10px; + padding-bottom: 10px; +} + +#navigation li { + display: inline; + list-style-type: none; + padding-left: 5px; + padding-right: 5px; +} + +#navigation li { + padding: 10px; + padding: 10px; +} + +#navigation li li { +} + +#navigation li:hover a { + color: rgb(166, 238, 255); +} + +#content { + padding: 20px; + width: 800px; + margin-left: auto; + margin-right: auto; +} + +#about { + display: none; +} + +dl.reference { + background-color: white; + padding: 20px; + border: solid #d3dbec 1px; +} + +dl.reference dt { + padding: 5px; + padding-top: 25px; + color: #637bbc; +} + +dl.reference dl dt { + padding-top: 5px; + color: #637383; +} + +dl.reference dd { +} + +@media print { + body { + font: 10pt "Times New Roman", "TimeNR", Times, serif; + } + a { + font-weight:bold; color: #004080; text-decoration: underline; + } + #main { + background-color: #ffffff; border-left: 0px; + } + #container { + margin-left: 2%; margin-right: 2%; background-color: #ffffff; + } + #content { + margin-left: 0px; padding: 1em; border-left: 0px; border-right: 0px; background-color: #ffffff; + } + #navigation { + display: none; + } + #product_logo { + display: none; + } + #about img { + display: none; + } + .example { + font-family: "Andale Mono", monospace; + font-size: 8pt; + page-break-inside: avoid; + } +} diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/examples.html b/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/examples.html index 746df62b4e5..68756c8b1d4 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/examples.html +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/examples.html @@ -3,7 +3,7 @@ LuaFileSystem - + @@ -13,7 +13,7 @@
@@ -33,7 +33,6 @@
  • Download
  • History
  • Credits
  • -
  • Contact us
  • Manual @@ -45,10 +44,10 @@
  • Examples
  • -
  • Project +
  • Project
  • License
  • @@ -65,7 +64,7 @@ attributes for each file inside it.

    -require"lfs"
    +local lfs = require"lfs"
     
     function attrdir (path)
         for file in lfs.dir(path) do
    @@ -94,7 +93,6 @@ attrdir (".")
     
     

    Valid XHTML 1.0!

    -

    $Id: examples.html,v 1.8 2007/12/14 15:28:04 carregal Exp $

    diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/index.html b/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/index.html index 43edefc5a1b..195ab60e75a 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/index.html +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/index.html @@ -3,7 +3,7 @@ LuaFileSystem - + @@ -13,7 +13,7 @@
    @@ -33,7 +33,6 @@
  • Download
  • History
  • Credits
  • -
  • Contact us
  • Manual @@ -45,10 +44,10 @@
  • Examples
  • -
  • Project +
  • Project
  • License
  • @@ -67,31 +66,70 @@ systems offered by the standard Lua distribution.

    the underlying directory structure and file attributes.

    LuaFileSystem is free software and uses the same -license as Lua 5.1.

    +license as Lua 5.x (MIT).

    Status

    -

    Current version is 1.5.0. It was developed for Lua 5.1.

    +

    Current version is 1.7.0. It works with Lua 5.1, 5.2 and 5.3, and it runs on various +flavors of Unix (including Linux, BSDs, macOS) and Windows.

    Download

    -

    LuaFileSystem source can be downloaded from its -Github -page.

    +

    LuaFileSystem can be installed using LuaRocks: + +

    +$ luarocks install luafilesystem
    +
    + +

    Its source can be found at its Github page.

    History

    +
    Version 1.7.0 [15/Sep/2017]
    +
      +
    • symlinkattributes function now provides 'target' field, containing name of the file that the symlink points to.
    • +
    • attributes, symlinkattributes, touch, mkdir, and rmdir functions now return system-dependent error code as the third value on error.
    • +
    • Fixed detection of closed files for Lua 5.2+ in setmode, lock, and unlock functions.
    • +
    • Fixed various compiler warnings.
    • +
    + +
    Version 1.6.3 [15/Jan/2015]
    +
      +
    • Lua 5.3 support.
    • +
    • Assorted bugfixes.
    • +
    + +
    Version 1.6.2 [??/Oct/2012]
    +
      +
    • Full Lua 5.2 compatibility (with Lua 5.1 fallbacks)
    • +
    + +
    Version 1.6.1 [01/Oct/2012]
    +
      +
    • fix build for Lua 5.2
    • +
    + +
    Version 1.6.0 [26/Sep/2012]
    +
      +
    • getcwd fix for Android
    • +
    • support for Lua 5.2
    • +
    • add lfs.link
    • +
    • other bug fixes
    • +
    +
    Version 1.5.0 [20/Oct/2009]
    +
    • Added explicit next and close methods to second return value of lfs.dir (the directory object), for explicit iteration or explicit closing.
    • Added directory locking via lfs.lock_dir function (see the manual).
    • +
    Version 1.4.2 [03/Feb/2009]
      -
    • fixed bug [#13198] - lfs.attributes(filename, 'size') overflow on files > 2 Gb again (bug report and patch by KUBO Takehiro).
    • -
    • fixed bug [#39794] +
    • fixed bug + lfs.attributes(filename, 'size') overflow on files > 2 Gb again (bug report and patch by KUBO Takehiro).
    • +
    • fixed bug Compile error on Solaris 10 (bug report and patch by Aaron B).
    • fixed compilation problems with Borland C.
    @@ -103,7 +141,7 @@ page.

  • documentation review
  • fixed Windows compilation issues
  • fixed bug in the Windows tests (patch by Shmuel Zeigerman)
  • -
  • fixed bug [#2185] +
  • fixed bug lfs.attributes(filename, 'size') overflow on files > 2 Gb
  • @@ -120,7 +158,7 @@ page.

    -
    Version 1.3.0 [26/Oct/2007]
    +
    Version 1.3.0 [26/Oct/2007]
    • added function @@ -129,14 +167,14 @@ page.

    -
    Version 1.2.1 [08/May/2007]
    +
    Version 1.2.1 [08/May/2007]
    • compatible only with Lua 5.1 (Lua 5.0 support was dropped)
    -
    Version 1.2 [15/Mar/2006]
    +
    Version 1.2 [15/Mar/2006]
    • added optional argument to @@ -147,14 +185,14 @@ page.

    -
    Version 1.1 [30/May/2005]
    +
    Version 1.1 [30/May/2005]
    -
    Version 1.0 [21/Jan/2005]
    +
    Version 1.0 [21/Jan/2005]
    Version 1.0 Beta [10/Nov/2004]
    @@ -165,25 +203,15 @@ page.

    LuaFileSystem was designed by Roberto Ierusalimschy, André Carregal and Tomás Guisasola as part of the -Kepler Project, +Kepler Project, which holds its copyright. LuaFileSystem is currently maintained by Fábio Mascarenhas.

    -

    Contact us

    - -

    For more information please -contact us. -Comments are welcome!

    - -

    You can also reach other Kepler developers and users on the Kepler Project -mailing list.

    -

    Valid XHTML 1.0!

    -

    $Id: index.html,v 1.44 2009/02/04 21:21:33 carregal Exp $

    diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/license.html b/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/license.html index 4ecad4bd7bb..4f828cf1467 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/license.html +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/license.html @@ -3,7 +3,7 @@ LuaFileSystem - + @@ -13,7 +13,7 @@
    @@ -33,7 +33,6 @@
  • Download
  • History
  • Credits
  • -
  • Contact us
  • Manual @@ -45,10 +44,10 @@
  • Examples
  • -
  • Project +
  • Project
  • License
  • @@ -69,7 +68,7 @@ software. Its licenses are compatible with GPL. LuaFileSystem is not in the public domain and the -Kepler Project +Kepler Project keep its copyright. The legal details are below.

    @@ -85,7 +84,7 @@ Ierusalimschy, André Carregal and Tomás Guisasola. The implementation is not derived from licensed software.


    -

    Copyright © 2003 Kepler Project.

    +

    Copyright © 2003 - 2017 Kepler Project.

    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -113,7 +112,6 @@ SOFTWARE.

    Valid XHTML 1.0!

    -

    $Id: license.html,v 1.13 2008/02/11 22:42:21 carregal Exp $

    diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/manual.html b/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/manual.html index 1409c404b1a..3555e3db4dd 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/manual.html +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/manual.html @@ -3,7 +3,7 @@ LuaFileSystem - + @@ -13,7 +13,9 @@
    LuaFileSystem
    File System Library for the Lua Programming Language
    @@ -31,7 +33,6 @@
  • Download
  • History
  • Credits
  • -
  • Contact us
  • Manual @@ -43,10 +44,10 @@
  • Examples
  • -
  • Project +
  • Project
  • License
  • @@ -101,14 +102,15 @@ LuaFileSystem offers the following functions:

    -
    lfs.attributes (filepath [, aname])
    +
    lfs.attributes (filepath [, aname | atable])
    Returns a table with the file attributes corresponding to - filepath (or nil followed by an error message + filepath (or nil 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 - lfs.attributes(filepath).aname, but the table is not created + lfs.attributes(filepath)[aname], but the table is not created and only one attribute is retrieved from the O.S.). + if a table is passed as the second argument, it is filled with attributes and returned instead of a new table. The attributes are described as follows; attribute mode 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:
    size
    file size, in bytes
    +
    permissions
    +
    file permissions string
    +
    blocks
    block allocated for file; (Unix only)
    @@ -172,9 +177,9 @@ LuaFileSystem offers the following functions: Returns true in case of success or nil plus an error string. -
    lfs.lock_dir(path, [seconds_stale])
    +
    lfs.lock_dir(path, [seconds_stale])
    Creates a lockfile (called lockfile.lfs) in path if it does not - exist and returns the lock. If the lock already exists checks it + exist and returns the lock. If the lock already exists checks if it's stale, using the second parameter (default for the second parameter is INT_MAX, which in practice means the lock will never be stale. To free the the lock call lock:free().
    @@ -182,7 +187,7 @@ LuaFileSystem offers the following functions: particular, if the lock exists and is not stale it returns the "File exists" message.
    -
    lfs.currentdir ()
    +
    lfs.currentdir ()
    Returns a string with the current working directory or nil plus an error string.
    @@ -206,30 +211,41 @@ LuaFileSystem offers the following functions: Returns true if the operation was successful; in case of error, it returns nil plus an error string. + +
    lfs.link (old, new[, symlink])
    +
    Creates a link. The first argument is the object to link to + and the second is the name of the link. If the optional third + argument is true, the link will by a symbolic link (by default, a + hard link is created). +
    lfs.mkdir (dirname)
    Creates a new directory. The argument is the name of the new directory.
    - Returns true if the operation was successful; - in case of error, it returns nil plus an error string. + Returns true in case of success or nil, an error message and + a system-dependent error code in case of error.
    lfs.rmdir (dirname)
    Removes an existing directory. The argument is the name of the directory.
    - Returns true if the operation was successful; - in case of error, it returns nil plus an error string.
    + Returns true in case of success or nil, an error message and + a system-dependent error code in case of error.
    lfs.setmode (file, mode)
    -
    Sets the writing mode for a file. The mode string can be either binary or text. - Returns the previous mode string for the file. This function is only available in Windows, so you may want to make sure that - lfs.setmode exists before using it. +
    Sets the writing mode for a file. The mode string can be either "binary" or "text". + Returns true followed the previous mode string for the file, or + nil followed by an error string in case of errors. + On non-Windows platforms, where the two modes are identical, + setting the mode has no effect, and the mode is always returned as binary.
    lfs.symlinkattributes (filepath [, aname])
    Identical to lfs.attributes except that it obtains information about the link itself (not the file it refers to). - This function is not available in Windows so you may want to make sure that - lfs.symlinkattributes exists before using it. + It also adds a target field, containing + the file name that the symlink points to. + On Windows this function does not yet support links, and is identical to + lfs.attributes.
    lfs.touch (filepath [, atime [, mtime]])
    @@ -241,8 +257,8 @@ LuaFileSystem offers the following functions: Lua standard function os.time). If the modification time is omitted, the access time provided is used; if both times are omitted, the current time is used.
    - Returns true if the operation was successful; - in case of error, it returns nil plus an error string. + Returns true in case of success or nil, an error message and + a system-dependent error code in case of error.
    lfs.unlock (filehandle[, start[, length]])
    @@ -262,7 +278,6 @@ LuaFileSystem offers the following functions:

    Valid XHTML 1.0!

    -

    $Id: manual.html,v 1.45 2009/06/03 20:53:55 mascarenhas Exp $

    diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.c b/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.c index 2b1b06cf1db..c8122c2ca95 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.c +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.c @@ -1,25 +1,25 @@ /* ** LuaFileSystem -** Copyright Kepler Project 2003 (http://www.keplerproject.org/luafilesystem) +** Copyright Kepler Project 2003 - 2017 (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 */ @@ -27,8 +27,11 @@ #define _LARGE_FILES 1 /* AIX */ #endif #endif +#endif +#ifndef LFS_DO_NOT_USE_LARGE_FILE #define _LARGEFILE64_SOURCE +#endif #include #include @@ -38,93 +41,133 @@ #include #ifdef _WIN32 -#include -#include -#include -#include -#ifdef __BORLANDC__ - #include + #include + #include + #include + #include + #ifdef __BORLANDC__ + #include + #else + #include + #endif + #include + /* MAX_PATH seems to be 260. Seems kind of small. Is there a better one? */ + #define LFS_MAXPATHLEN MAX_PATH #else - #include -#endif -#include -#else -#include -#include -#include -#include -#include + #include + #include + #include + #include + #include + #include /* for MAXPATHLEN */ + #define LFS_MAXPATHLEN MAXPATHLEN #endif -#include "lua.h" -#include "lauxlib.h" -#include "lualib.h" +#include +#include +#include + #include "lfs.h" -/* Define 'strerror' for systems that do not implement it */ -#ifdef NO_STRERROR -#define strerror(_) "System unable to describe the error" +#define LFS_VERSION "1.7.0" +#define LFS_LIBNAME "lfs" + +#if LUA_VERSION_NUM >= 503 /* Lua 5.3 */ + +#ifndef luaL_optlong +#define luaL_optlong luaL_optinteger #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" +#endif + +#if LUA_VERSION_NUM >= 502 +# define new_lib(L, l) (luaL_newlib(L, l)) #else -#define getcwd_error strerror(errno) +# define new_lib(L, l) (lua_newtable(L), luaL_register(L, NULL, l)) +#endif + +/* Define 'strerror' for systems that do not implement it */ +#ifdef NO_STRERROR +#define strerror(_) "System unable to describe the error" #endif -#define DIR_METATABLE "lfs.directory" -#define MAX_DIR_LENGTH 1023 +#define DIR_METATABLE "directory metatable" typedef struct dir_data { - int closed; + int closed; #ifdef _WIN32 - long hFile; - char pattern[MAX_DIR_LENGTH+1]; + intptr_t hFile; + char pattern[MAX_PATH+1]; #else - DIR *dir; + DIR *dir; #endif } dir_data; -#define LOCK_METATABLE "lfs.lock" +#define LOCK_METATABLE "lock metatable" #ifdef _WIN32 #ifdef __BORLANDC__ - #define lfs_setmode(L,file,m) ((void)L, setmode(_fileno(file), m)) + #define lfs_setmode(file, m) (setmode(_fileno(file), m)) #define STAT_STRUCT struct stati64 #else - #define lfs_setmode(L,file,m) ((void)L, _setmode(_fileno(file), m)) + #define lfs_setmode(file, m) (_setmode(_fileno(file), m)) #define STAT_STRUCT struct _stati64 #endif #define STAT_FUNC _stati64 +#define LSTAT_FUNC STAT_FUNC #else -#ifndef _O_TEXT - #define _O_TEXT 0 -#endif -#ifndef _O_BINARY - #define _O_BINARY 0 -#endif -#define lfs_setmode(L,file,m) ((void)((void)file,m), \ - luaL_error(L, LUA_QL("setmode") " not supported on this platform"), -1) +#define _O_TEXT 0 +#define _O_BINARY 0 +#define lfs_setmode(file, m) ((void)file, (void)m, 0) #define STAT_STRUCT struct stat #define STAT_FUNC stat #define LSTAT_FUNC lstat #endif +#ifdef _WIN32 + #define lfs_mkdir _mkdir +#else + #define lfs_mkdir(path) (mkdir((path), \ + S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IXOTH)) +#endif + +/* +** Utility functions +*/ +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; +} + +static int pushresult(lua_State *L, int res, const char *info) { + if (res == -1) { + return pusherror(L, info); + } else { + lua_pushboolean(L, 1); + return 1; + } +} + + /* ** 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; - } + 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; + } } /* @@ -132,36 +175,59 @@ static int change_dir (lua_State *L) { ** If unable to get the current directory, it returns nil ** and a string describing the error */ -#ifndef PATH_MAX -#define PATH_MAX 4096 -#endif - static int get_dir (lua_State *L) { - char path[PATH_MAX]; - if (getcwd((char *)path, PATH_MAX) == NULL) { +#ifdef NO_GETCWD lua_pushnil(L); - lua_pushstring(L, getcwd_error); + lua_pushstring(L, "Function 'getcwd' not provided by system"); return 2; - } - else { - lua_pushstring(L, path); - return 1; - } +#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) { + path = realloc(path, size); + if (!path) /* failed to allocate */ + return pusherror(L, "get_dir realloc() failed"); + if (getcwd(path, size) != NULL) { + /* success, push the path to the Lua stack */ + lua_pushstring(L, path); + result = 1; + break; + } + if (errno != ERANGE) { /* unexpected error */ + result = pusherror(L, "get_dir getcwd() failed"); + break; + } + /* ERANGE = insufficient buffer capacity, double size and retry */ + size *= 2; + } + free(path); + return result; +#endif } /* ** Check if the given element on the stack is a file and returns it. */ static FILE *check_file (lua_State *L, int idx, const char *funcname) { - FILE **fh = (FILE **)luaL_checkudata (L, idx, "FILE*"); - if (fh == NULL) { - luaL_error (L, "%s: not a file", funcname); - return 0; - } else if (*fh == NULL) { - luaL_error (L, "%s: closed file", funcname); - return 0; - } else - return *fh; +#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; +#else +#error unsupported Lua version +#endif } @@ -169,50 +235,50 @@ 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; + 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 @@ -226,19 +292,19 @@ static int lfs_lock_dir(lua_State *L) { const char *lockfile = "/lockfile.lfs"; const char *path = luaL_checklstring(L, 1, &pathl); ln = (char*)malloc(pathl + strlen(lockfile) + 1); - if(!ln) { + if(!ln) { lua_pushnil(L); lua_pushstring(L, strerror(errno)); return 2; } strcpy(ln, path); strcat(ln, lockfile); - if((fd = CreateFile(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; + if((fd = CreateFile(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; } free(ln); lock = (lfs_Lock*)lua_newuserdata(L, sizeof(lfs_Lock)); @@ -248,8 +314,11 @@ static int lfs_lock_dir(lua_State *L) { return 1; } static int lfs_unlock_dir(lua_State *L) { - lfs_Lock *lock = luaL_checkudata(L, 1, LOCK_METATABLE); - CloseHandle(lock->fd); + 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; + } return 0; } #else @@ -264,12 +333,12 @@ static int lfs_lock_dir(lua_State *L) { 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) { + 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); + free(ln); lua_pushnil(L); lua_pushstring(L, strerror(errno)); return 2; } lock->ln = ln; @@ -278,7 +347,7 @@ static int lfs_lock_dir(lua_State *L) { return 1; } static int lfs_unlock_dir(lua_State *L) { - lfs_Lock *lock = luaL_checkudata(L, 1, LOCK_METATABLE); + lfs_Lock *lock = (lfs_Lock *)luaL_checkudata(L, 1, LOCK_METATABLE); if(lock->ln) { unlink(lock->ln); free(lock->ln); @@ -288,39 +357,26 @@ static int lfs_unlock_dir(lua_State *L) { } #endif -#ifdef _WIN32 static int lfs_g_setmode (lua_State *L, FILE *f, int arg) { - static const int mode[] = {_O_TEXT, _O_BINARY}; - static const char *const modenames[] = {"text", "binary", NULL}; + 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); } } -#else -static int lfs_g_setmode (lua_State *L, FILE *f, int arg) { - lua_pushboolean(L, 0); - lua_pushliteral(L, "setmode not supported on this platform"); - return 2; -} -#endif static int lfs_f_setmode(lua_State *L) { return lfs_g_setmode(L, check_file(L, 1, "setmode"), 2); @@ -334,18 +390,18 @@ static int lfs_f_setmode(lua_State *L) { ** @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 = luaL_optlong (L, 3, 0); - long len = luaL_optlong (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; - } + 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; + } } @@ -356,99 +412,107 @@ static int file_lock (lua_State *L) { ** @param #3 Number with length (optional). */ static int file_unlock (lua_State *L) { - FILE *fh = check_file (L, 1, "unlock"); - const long start = luaL_optlong (L, 2, 0); - long len = luaL_optlong (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; - } + 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 make_dir (lua_State *L) { - const char *path = luaL_checkstring (L, 1); - int fail; -#ifdef _WIN32 - fail = _mkdir (path); +/* +** Creates a link. +** @param #1 Object to link to. +** @param #2 Name of link. +** @param #3 True if link is symbolic (optional). +*/ +static int make_link (lua_State *L) { +#ifndef _WIN32 + const char *oldpath = luaL_checkstring(L, 1); + const char *newpath = luaL_checkstring(L, 2); + int res = (lua_toboolean(L,3) ? symlink : link)(oldpath, newpath); + if (res == -1) { + return pusherror(L, NULL); + } else { + lua_pushinteger(L, 0); + return 1; + } #else - fail = mkdir (path, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | - S_IWGRP | S_IXGRP | S_IROTH | S_IXOTH ); + errno = ENOSYS; /* = "Function not implemented" */ + return pushresult(L, -1, "make_link is not supported on Windows"); #endif - if (fail) { - lua_pushnil (L); - lua_pushfstring (L, "%s", strerror(errno)); - return 2; - } - lua_pushboolean (L, 1); - return 1; } + /* -** Removes a directory. +** Creates a directory. ** @param #1 Directory path. */ -static int remove_dir (lua_State *L) { - const char *path = luaL_checkstring (L, 1); - int fail; +static int make_dir (lua_State *L) { + const char *path = luaL_checkstring(L, 1); + return pushresult(L, lfs_mkdir(path), NULL); +} - fail = rmdir (path); - if (fail) { - lua_pushnil (L); - lua_pushfstring (L, "%s", strerror(errno)); - return 2; - } - lua_pushboolean (L, 1); - return 1; +/* +** Removes a directory. +** @param #1 Directory path. +*/ +static int remove_dir (lua_State *L) { + const char *path = luaL_checkstring(L, 1); + return pushresult(L, rmdir(path), NULL); } + /* ** Directory iterator */ 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, 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)); - 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 } @@ -457,19 +521,18 @@ 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); + dir_data *d = (dir_data *)lua_touserdata (L, 1); #ifdef _WIN32 - if (!d->closed && d->hFile) { - _findclose (d->hFile); - d->closed = 1; - } + if (!d->closed && d->hFile) { + _findclose (d->hFile); + } #else - if (!d->closed && d->dir) { - closedir (d->dir); - d->closed = 1; - } + if (!d->closed && d->dir) { + closedir (d->dir); + } #endif - return 0; + d->closed = 1; + return 0; } @@ -477,27 +540,25 @@ static int dir_close (lua_State *L) { ** 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)); - d->closed = 0; + 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; - luaL_getmetatable (L, DIR_METATABLE); - lua_setmetatable (L, -2); - if (strlen(path) > MAX_DIR_LENGTH) - luaL_error (L, "path too long: %s", path); - else - sprintf (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 - luaL_getmetatable (L, DIR_METATABLE); - lua_setmetatable (L, -2); - 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 - return 2; + return 2; } @@ -505,36 +566,39 @@ static int dir_iter_factory (lua_State *L) { ** Creates directory metatable. */ static int dir_create_meta (lua_State *L) { - luaL_newmetatable (L, DIR_METATABLE); - /* set its __gc field */ - lua_pushstring (L, "__index"); - lua_newtable(L); - lua_pushstring (L, "next"); - lua_pushcfunction (L, dir_iter); - lua_settable(L, -3); - lua_pushstring (L, "close"); - lua_pushcfunction (L, dir_close); - lua_settable(L, -3); - lua_settable (L, -3); - lua_pushstring (L, "__gc"); - lua_pushcfunction (L, dir_close); - lua_settable (L, -3); - return 1; + 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; } + /* ** Creates lock metatable. */ static int lock_create_meta (lua_State *L) { - luaL_newmetatable (L, LOCK_METATABLE); - /* set its __gc field */ - lua_newtable(L); - lua_pushcfunction(L, lfs_unlock_dir); - lua_setfield(L, -2, "free"); - lua_setfield(L, -2, "__index"); - lua_pushcfunction(L, lfs_unlock_dir); - lua_setfield(L, -2, "__gc"); - return 1; + 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; } @@ -574,104 +638,96 @@ static const char *mode2string (mode_t mode) { else if ( S_ISDIR(mode) ) return "directory"; else if ( S_ISLNK(mode) ) - return "link"; + return "link"; else if ( S_ISSOCK(mode) ) return "socket"; else if ( S_ISFIFO(mode) ) - return "named pipe"; + return "named pipe"; else if ( S_ISCHR(mode) ) - return "char device"; + return "char device"; else if ( S_ISBLK(mode) ) - return "block device"; + 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 = (time_t)luaL_optnumber (L, 2, 0); - utb.modtime = (time_t)luaL_optnumber (L, 3, utb.actime); - buf = &utb; - } - if (utime (file, buf)) { - lua_pushnil (L); - lua_pushfstring (L, "%s", strerror (errno)); - return 2; - } - lua_pushboolean (L, 1); - return 1; + 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)); + lua_pushstring (L, mode2string (info->st_mode)); } /* device inode resides on */ static void push_st_dev (lua_State *L, STAT_STRUCT *info) { - lua_pushnumber (L, (lua_Number)info->st_dev); + lua_pushinteger (L, (lua_Integer) info->st_dev); } /* inode's number */ static void push_st_ino (lua_State *L, STAT_STRUCT *info) { - lua_pushnumber (L, (lua_Number)info->st_ino); + 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_pushnumber (L, (lua_Number)info->st_nlink); + lua_pushinteger (L, (lua_Integer)info->st_nlink); } /* user-id of owner */ static void push_st_uid (lua_State *L, STAT_STRUCT *info) { - lua_pushnumber (L, (lua_Number)info->st_uid); + lua_pushinteger (L, (lua_Integer)info->st_uid); } /* group-id of owner */ static void push_st_gid (lua_State *L, STAT_STRUCT *info) { - lua_pushnumber (L, (lua_Number)info->st_gid); + 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_pushnumber (L, (lua_Number)info->st_rdev); + lua_pushinteger (L, (lua_Integer) info->st_rdev); } /* time of last access */ static void push_st_atime (lua_State *L, STAT_STRUCT *info) { - lua_pushnumber (L, info->st_atime); + 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_pushnumber (L, info->st_mtime); + 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_pushnumber (L, info->st_ctime); + lua_pushinteger (L, (lua_Integer) info->st_ctime); } /* file size, in bytes */ static void push_st_size (lua_State *L, STAT_STRUCT *info) { - lua_pushnumber (L, (lua_Number)info->st_size); + 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_pushnumber (L, (lua_Number)info->st_blocks); + 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_pushnumber (L, (lua_Number)info->st_blksize); + lua_pushinteger (L, (lua_Integer)info->st_blksize); } #endif -static void push_invalid (lua_State *L, STAT_STRUCT *info) { - luaL_error(L, "invalid attribute name"); -#ifndef _WIN32 - info->st_blksize = 0; /* never reached */ -#endif -} /* ** Convert the inode protection mode to a permission list. @@ -679,20 +735,20 @@ static void push_invalid (lua_State *L, STAT_STRUCT *info) { #ifdef _WIN32 static const char *perm2string (unsigned short mode) { - static char perms[10] = "---------\0"; + static char perms[10] = "---------"; int i; - for (i=0;i<9;i++) perms[i]='-'; - if (mode & _S_IREAD) + 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) + if (mode & _S_IWRITE) { perms[1] = 'w'; perms[4] = 'w'; perms[7] = 'w'; } - if (mode & _S_IEXEC) + if (mode & _S_IEXEC) { perms[2] = 'x'; perms[5] = 'x'; perms[8] = 'x'; } return perms; } #else static const char *perm2string (mode_t mode) { - static char perms[10] = "---------\0"; + static char perms[10] = "---------"; int i; for (i=0;i<9;i++) perms[i]='-'; if (mode & S_IRUSR) perms[0] = 'r'; @@ -716,68 +772,68 @@ static void push_st_perm (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, push_invalid } + { NULL, NULL } }; /* ** Get file or symbolic link information */ static int _file_info_ (lua_State *L, int (*st)(const char*, STAT_STRUCT*)) { - int i; - STAT_STRUCT info; - const char *file = luaL_checkstring (L, 1); - - if (st(file, &info)) { - lua_pushnil (L); - lua_pushfstring (L, "cannot obtain information from file `%s'", file); - return 2; - } - if (lua_isstring (L, 2)) { - int v; - const char *member = lua_tostring (L, 2); - if (strcmp (member, "mode") == 0) v = 0; -#ifndef _WIN32 - else if (strcmp (member, "blocks") == 0) v = 11; - else if (strcmp (member, "blksize") == 0) v = 12; -#endif - else /* look for member */ - for (v = 1; members[v].name; v++) - if (*members[v].name == *member) - break; - /* push member value and return */ - members[v].push (L, &info); - return 1; - } else if (!lua_istable (L, 2)) - /* creates a table if none is given */ - lua_newtable (L); - /* stores all members in table on top of the stack */ - for (i = 0; members[i].name; i++) { - lua_pushstring (L, members[i].name); - members[i].push (L, &info); - lua_rawset (L, -3); - } - return 1; + 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; } @@ -785,62 +841,101 @@ static int _file_info_ (lua_State *L, int (*st)(const char*, STAT_STRUCT*)) { ** Get file information using stat. */ static int file_info (lua_State *L) { - return _file_info_ (L, STAT_FUNC); + return _file_info_ (L, STAT_FUNC); } /* -** Get symbolic link information using lstat. +** 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). */ -#ifndef _WIN32 -static int link_info (lua_State *L) { - return _file_info_ (L, LSTAT_FUNC); -} +static int push_link_target(lua_State *L) { +#ifdef _WIN32 + errno = ENOSYS; + return 0; #else + const char *file = luaL_checkstring(L, 1); + char *target = NULL; + int tsize, size = 256; /* size = initial buffer capacity */ + while (1) { + target = realloc(target, size); + if (!target) /* failed to allocate */ + return 0; + tsize = readlink(file, target, size); + if (tsize < 0) { /* a readlink() error occurred */ + free(target); + return 0; + } + if (tsize < size) + break; + /* possibly truncated readlink() result, double size and retry */ + size *= 2; + } + target[tsize] = '\0'; + lua_pushlstring(L, target, tsize); + free(target); + return 1; +#endif +} + +/* +** Get symbolic link information using lstat. +*/ static int link_info (lua_State *L) { - lua_pushboolean(L, 0); - lua_pushliteral(L, "symlinkattributes not supported on this platform"); - return 2; + 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; } -#endif /* ** Assumes the table is on top of the stack. */ static void set_info (lua_State *L) { - lua_pushliteral (L, "_COPYRIGHT"); - lua_pushliteral (L, "Copyright (C) 2003-2009 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 1.5.0"); - lua_settable (L, -3); + 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}, - {"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_register (L, "lfs", fslib); - 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/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.def b/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.def index f79cd298b31..4055ff04b24 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.def +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.def @@ -1,5 +1,4 @@ LIBRARY lfs.dll -DESCRIPTION "LuaFileSystem" -VERSION 1.4.2 +VERSION 1.7 EXPORTS luaopen_lfs diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.h b/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.h index 4b52780bb3f..458756404ed 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.h +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.h @@ -1,17 +1,34 @@ /* ** LuaFileSystem -** Copyright Kepler Project 2003 (http://www.keplerproject.org/luafilesystem) -** -** $Id: lfs.h,v 1.5 2008/02/19 20:08:23 mascarenhas Exp $ +** Copyright Kepler Project 2003 - 2017 (http://keplerproject.github.io/luafilesystem) */ /* Define 'chdir' for systems that do not implement it */ #ifdef NO_CHDIR -#define chdir(p) (-1) -#define chdir_error "Function 'chdir' not provided by system" + #define chdir(p) (-1) + #define chdir_error "Function 'chdir' not provided by system" #else -#define chdir_error strerror(errno) + #define chdir_error strerror(errno) #endif +#ifdef _WIN32 + #define chdir(p) (_chdir(p)) + #define getcwd(d, s) (_getcwd(d, s)) + #define rmdir(p) (_rmdir(p)) + #define LFS_EXPORT __declspec (dllexport) + #ifndef fileno + #define fileno(f) (_fileno(f)) + #endif +#else + #define LFS_EXPORT +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +LFS_EXPORT int luaopen_lfs (lua_State *L); -int luaopen_lfs (lua_State *L); +#ifdef __cplusplus +} +#endif diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/tests/test.lua b/Build/source/texk/web2c/luatexdir/luafilesystem/tests/test.lua index 71110749c06..591ee25974b 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/tests/test.lua +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/tests/test.lua @@ -1,28 +1,31 @@ -#!/usr/local/bin/lua5.1 +#!/usr/bin/env lua5.1 local tmp = "/tmp" -local sep = "/" +local sep = string.match (package.config, "[^\n]+") local upper = ".." -require"lfs" +local lfs = require"lfs" print (lfs._VERSION) +io.write(".") +io.flush() + function attrdir (path) - for file in lfs.dir(path) do - if file ~= "." and file ~= ".." then - local f = path..sep..file - print ("\t=> "..f.." <=") - local attr = lfs.attributes (f) - assert (type(attr) == "table") - if attr.mode == "directory" then - attrdir (f) - else - for name, value in pairs(attr) do - print (name, value) - end - end - end - end + for file in lfs.dir(path) do + if file ~= "." and file ~= ".." then + local f = path..sep..file + print ("\t=> "..f.." <=") + local attr = lfs.attributes (f) + assert (type(attr) == "table") + if attr.mode == "directory" then + attrdir (f) + else + for name, value in pairs(attr) do + print (name, value) + end + end + end + end end -- Checking changing directories @@ -33,6 +36,9 @@ assert (lfs.chdir (reldir), "could not change back to current directory") assert (lfs.currentdir() == current, "error trying to change directories") assert (lfs.chdir ("this couldn't be an actual directory") == nil, "could change to a non-existent directory") +io.write(".") +io.flush() + -- Changing creating and removing directories local tmpdir = current..sep.."lfs_tmp_dir" local tmpfile = tmpdir..sep.."tmp_file" @@ -40,19 +46,25 @@ local tmpfile = tmpdir..sep.."tmp_file" -- that may have resulted from an interrupted test execution and remove it if lfs.chdir (tmpdir) then assert (lfs.chdir (upper), "could not change to upper directory") - assert (os.remove (tmpfile), "could not remove file from previous test") + assert (os.remove (tmpfile), "could not remove file from previous test") assert (lfs.rmdir (tmpdir), "could not remove directory from previous test") end +io.write(".") +io.flush() + -- tries to create a directory assert (lfs.mkdir (tmpdir), "could not make a new directory") local attrib, errmsg = lfs.attributes (tmpdir) if not attrib then - error ("could not get attributes of file `"..tmpdir.."':\n"..errmsg) + error ("could not get attributes of file `"..tmpdir.."':\n"..errmsg) end local f = io.open(tmpfile, "w") f:close() +io.write(".") +io.flush() + -- Change access time local testdate = os.time({ year = 2007, day = 10, month = 2, hour=0}) assert (lfs.touch (tmpfile, testdate)) @@ -60,6 +72,9 @@ local new_att = assert (lfs.attributes (tmpfile)) assert (new_att.access == testdate, "could not set access time") assert (new_att.modification == testdate, "could not set modification time") +io.write(".") +io.flush() + -- Change access and modification time local testdate1 = os.time({ year = 2007, day = 10, month = 2, hour=0}) local testdate2 = os.time({ year = 2007, day = 11, month = 2, hour=0}) @@ -69,48 +84,94 @@ local new_att = assert (lfs.attributes (tmpfile)) assert (new_att.access == testdate2, "could not set access time") assert (new_att.modification == testdate1, "could not set modification time") -local res, err = lfs.symlinkattributes(tmpfile) -if err ~= "symlinkattributes not supported on this platform" then - -- Checking symbolic link information (does not work in Windows) - assert (os.execute ("ln -s "..tmpfile.." _a_link_for_test_")) - assert (lfs.attributes"_a_link_for_test_".mode == "file") - assert (lfs.symlinkattributes"_a_link_for_test_".mode == "link") - assert (os.remove"_a_link_for_test_") +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.link (tmpfile, "_a_hard_link_for_test_")) + assert (lfs.attributes (tmpfile, "nlink") == 2) + assert (os.remove"_a_link_for_test_") + assert (os.remove"_a_hard_link_for_test_") end -if lfs.setmode then - -- Checking text/binary modes (works only in Windows) - local f = io.open(tmpfile, "w") - local result, mode = lfs.setmode(f, "binary") - assert((result and mode == "text") or (not result and mode == "setmode not supported on this platform")) - result, mode = lfs.setmode(f, "text") - assert((result and mode == "binary") or (not result and mode == "setmode not supported on this platform")) - f:close() -end - +io.write(".") +io.flush() + +-- Checking text/binary modes (only has an effect in Windows) +local f = io.open(tmpfile, "w") +local result, mode = lfs.setmode(f, "binary") +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() + -- Restore access time to current value assert (lfs.touch (tmpfile, attrib.access, attrib.modification)) new_att = assert (lfs.attributes (tmpfile)) assert (new_att.access == attrib.access) assert (new_att.modification == attrib.modification) +io.write(".") +io.flush() + +-- Check consistency of lfs.attributes values +local attr = lfs.attributes (tmpfile) +for key, value in pairs(attr) do + assert (value == lfs.attributes (tmpfile, key), + "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") assert (lfs.mkdir (tmpdir..sep.."lfs_tmp_dir") == nil, "could create a directory inside a non-existent one") +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(".") +io.flush() + -- Stressing directory iterator count = 0 for i = 1, 4000 do - for file in lfs.dir (tmp) do - count = count + 1 - end + for file in lfs.dir (tmp) do + count = count + 1 + end end +io.write(".") +io.flush() + -- Stressing directory iterator, explicit version count = 0 for i = 1, 4000 do @@ -123,6 +184,9 @@ for i = 1, 4000 do assert(not pcall(dir.next, dir)) end +io.write(".") +io.flush() + -- directory explicit close local iter, dir = lfs.dir(tmp) dir:close() -- cgit v1.2.3