diff options
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/luafilesystem')
13 files changed, 492 insertions, 219 deletions
diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/Makefile b/Build/source/texk/web2c/luatexdir/luafilesystem/Makefile index 35e7b3e9d54..10d9ca44c2c 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/Makefile +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/Makefile @@ -1,28 +1,22 @@ -# $Id: Makefile,v 1.26 2005/06/27 17:06:01 tomas Exp $
-
-T= lfs
-V= 1.2
-CONFIG= ./config
-
-include $(CONFIG)
-
-COMPAT_O= $(COMPAT_DIR)/compat-5.1.o
-SRCS= src/$T.c
-OBJS= src/$T.o $(COMPAT_O)
-
-
-lib: src/$(LIBNAME)
-
-src/$(LIBNAME): $(OBJS)
- export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS)
-
-$(COMPAT_O): $(COMPAT_DIR)/compat-5.1.c
- $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
-
-install: src/$(LIBNAME)
- mkdir -p $(LUA_LIBDIR)
- cp src/$(LIBNAME) $(LUA_LIBDIR)
- cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
-
-clean:
- rm -f src/$(LIBNAME) $(OBJS) $(COMPAT_O)
+# $Id: Makefile,v 1.34 2008/05/07 19:06:37 carregal Exp $ + +T= lfs + +CONFIG= ./config + +include $(CONFIG) + +SRCS= src/$T.c +OBJS= src/$T.o + +lib: src/lfs.so + +src/lfs.so: $(OBJS) + export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/lfs.so $(OBJS) + +install: + mkdir -p $(LUA_LIBDIR) + cp src/lfs.so $(LUA_LIBDIR) + +clean: + rm -f src/lfs.so $(OBJS) diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/Makefile.win b/Build/source/texk/web2c/luatexdir/luafilesystem/Makefile.win new file mode 100644 index 00000000000..65cab812408 --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/Makefile.win @@ -0,0 +1,25 @@ +# $Id: Makefile.win,v 1.11 2008/05/07 19:06:37 carregal Exp $ + +T= lfs + +include config.win + +SRCS= src\$T.c +OBJS= src\$T.obj + +lib: src\lfs.dll + +.c.obj: + $(CC) /c /Fo$@ $(CFLAGS) $< + +src\lfs.dll: $(OBJS) + link /dll /def:src\$T.def /out:src\lfs.dll $(OBJS) "$(LUA_LIB)" + IF EXIST src\lfs.dll.manifest mt -manifest src\lfs.dll.manifest -outputresource:src\lfs.dll;2 + +install: src\lfs.dll + IF NOT EXIST "$(LUA_LIBDIR)" mkdir "$(LUA_LIBDIR)" + copy src\lfs.dll "$(LUA_LIBDIR)" + +clean: + del src\lfs.dll $(OBJS) src\$T.lib src\$T.exp + IF EXIST src\lfs.dll.manifest del src\lfs.dll.manifest
\ No newline at end of file diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/README b/Build/source/texk/web2c/luatexdir/luafilesystem/README new file mode 100644 index 00000000000..858ecb67bb0 --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/README @@ -0,0 +1,38 @@ +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 + +Version 1.4.1 [07/May/2008] changes: + * 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 + +LuaRocks Installation +--------------------- +luarocks install luafilesystem + +Unix Installation +----------------- +To install on Linux/OSX/BSD, please edit the config file and then call + +make +make install + +The last step may require root privileges. + +Windows Installation +-------------------- +To install on Windows, please copy lfs.dll to your package.cpath directory + +Documentation +------------- +Please check the documentation at /doc/us/ for more information. diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/config b/Build/source/texk/web2c/luatexdir/luafilesystem/config index d27284333ea..cfd4c6a6d3e 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/config +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/config @@ -1,20 +1,24 @@ -# Installation directories
-# System's libraries directory (where binary libraries are installed)
-LUA_LIBDIR= /usr/local/lib/lua/5.0
-# Lua includes directory
-LUA_INC= /usr/local/include
-
-# OS dependent
-LIB_OPTION= -shared #for Linux
-#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
-
-LIBNAME= $T.so.$V
-COMPAT_DIR= ../compat/src
-
-# Compilation directives
-WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings
-INCS= -I$(LUA_INC) -I$(COMPAT_DIR)
-CFLAGS= $(WARN) $(INCS)
-CC= gcc
-
-# $Id: config,v 1.14 2005/06/24 01:49:16 tomas Exp $
+# Installation directories + +# Default installation prefix +PREFIX=/usr/local + +# System's libraries directory (where binary libraries are installed) +LUA_LIBDIR= $(PREFIX)/lib/lua/5.1 + +# Lua includes directory +LUA_INC= $(PREFIX)/include + +# OS dependent +LIB_OPTION= -shared #for Linux +#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X + +LIBNAME= $T.so.$V + +# Compilation directives +WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic +INCS= -I$(LUA_INC) +CFLAGS= $(WARN) $(INCS) +CC= gcc + +# $Id: config,v 1.21 2007/10/27 22:42:32 carregal Exp $ diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/config.win b/Build/source/texk/web2c/luatexdir/luafilesystem/config.win new file mode 100644 index 00000000000..50e81f64206 --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/config.win @@ -0,0 +1,19 @@ +# Installation directories +# System's libraries directory (where binary libraries are installed) +LUA_LIBDIR= "c:\lua5.1" + +# Lua includes directory +LUA_INC= "c:\lua5.1\include" + +# Lua library +LUA_LIB= "c:\lua5.1\lua5.1.lib" + +LIBNAME= $T.dll + +# Compilation directives +WARN= /O2 +INCS= /I$(LUA_INC) +CFLAGS= /MD $(WARN) $(INCS) +CC= cl + +# $Id: config.win,v 1.7 2008/03/25 17:39:29 mascarenhas Exp $ 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 89f70707287..746df62b4e5 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/examples.html +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/examples.html @@ -1,6 +1,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <title>LuaFileSystem</title> <link rel="stylesheet" href="http://www.keplerproject.org/doc.css" type="text/css"/> @@ -39,6 +39,7 @@ <li><a href="manual.html">Manual</a> <ul> <li><a href="manual.html#introduction">Introduction</a></li> + <li><a href="manual.html#building">Building</a></li> <li><a href="manual.html#installation">Installation</a></li> <li><a href="manual.html#reference">Reference</a></li> </ul> @@ -92,9 +93,8 @@ attrdir (".") </div> <!-- id="main" --> <div id="about"> - <p><a href="http://validator.w3.org/check?uri=referer"> - <img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p> - <p><small>$Id: examples.html,v 1.5 2006/03/14 14:07:55 carregal Exp $</small></p> + <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/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/index.html b/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/index.html index 15c954a1fc8..63b57915e9d 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/index.html +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/index.html @@ -1,6 +1,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <title>LuaFileSystem</title> <link rel="stylesheet" href="http://www.keplerproject.org/doc.css" type="text/css"/> @@ -39,6 +39,7 @@ <li><a href="manual.html">Manual</a> <ul> <li><a href="manual.html#introduction">Introduction</a></li> + <li><a href="manual.html#building">Building</a></li> <li><a href="manual.html#installation">Installation</a></li> <li><a href="manual.html#reference">Reference</a></li> </ul> @@ -66,46 +67,77 @@ 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.0.</p> +<a href="license.html">license</a> as Lua 5.1.</p> <h2><a name="status"></a>Status</h2> -<p>Current version is 1.2. It was developed for Lua 5.0.</p> - -<p>Version 1.2 follows the -<a href="http://www.keplerproject.org/compat">package model</a> -for Lua 5.1 (see section <a href="manual.html#installation">Installation</a> -for more details).</p> - +<p>Current version is 1.4.1. It was developed for Lua 5.1.</p> <h2><a name="download"></a>Download</h2> <p>LuaFileSystem source can be downloaded from its <a href="http://luaforge.net/projects/luafilesystem/files">Lua Forge</a> page. If you are using -<a href="http://luabinaries.luaforge.net">LuaBinaries</a> Release 2 -a Windows binary version of LuaFileSystem can also be found at the -LuaForge page.</p> - +<a href="http://luabinaries.luaforge.net">LuaBinaries</a> 5.1.3 a Windows binary +version of LuaFileSystem (compiled with Visual Studio 2005 Express) can be found at the same LuaForge page.</p> <h2><a name="history"></a>History</h2> <dl class="history"> - <dt><strong>Version 1.2</strong> [15/Mar/2006]</dt> + <dt><strong>Version 1.4.1</strong> [07/May/2008]</dt> + <dd> + <ul> + <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>] + <code>lfs.attributes(filename, 'size')</code> overflow on files > 2 Gb + </li> + </ul> + </dd> + + <dt><strong>Version 1.4.0</strong> [13/Feb/2008]</dt> + <dd> + <ul> + <li>added function + <a href="manual.html#setmode"><code>lfs.setmode</code></a> + (works only in Windows systems).</li> + <li><a href="manual.html#attributes"><code>lfs.attributes</code></a> + raises an error if attribute does not exist</li> + </ul> + </dd> + + <dt><strong><a href="http://www.keplerproject.org/luafilesystem/1.3/">Version 1.3.0</a></strong> [26/Oct/2007]</dt> + <dd> + <ul> + <li>added function + <a href="manual.html#symlinkattributes"><code>lfs.symlinkattributes</code></a> + (works only in non Windows systems).</li> + </ul> + </dd> + + <dt><strong><a href="http://www.keplerproject.org/luafilesystem/1.2/">Version 1.2.1</a></strong> [08/May/2007]</dt> + <dd> + <ul> + <li>compatible only with Lua 5.1 (Lua 5.0 support was dropped)</li> + </ul> + </dd> + + <dt><strong><a href="http://www.keplerproject.org/luafilesystem/1.2/">Version 1.2</a></strong> [15/Mar/2006]</dt> <dd> <ul> <li>added optional argument to <a href="manual.html#attributes"><code>lfs.attributes</code></a></li> <li>added function <a href="manual.html#rmdir"><code>lfs.rmdir</code></a></li> - <li>bug correction on <code>lfs.dir</code></li> + <li>bug correction on <a href="manual.html#dir"><code>lfs.dir</code></a></li> </ul> </dd> <dt><strong><a href="http://www.keplerproject.org/luafilesystem/1.1/">Version 1.1</a></strong> [30/May/2005]</dt> <dd> <ul> - <li>added function <code>lfs.touch</code>.</li> + <li>added function <a href="manual.html#touch"><code>lfs.touch</code></a>.</li> </ul> </dd> @@ -137,9 +169,8 @@ Comments are welcome!</p> </div> <!-- id="main" --> <div id="about"> - <p><a href="http://validator.w3.org/check?uri=referer"> - <img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p> - <p><small>$Id: index.html,v 1.30 2006/03/15 16:44:04 carregal Exp $</small></p> + <p><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a></p> + <p><small>$Id: index.html,v 1.42 2008/05/07 19:06:37 carregal Exp $</small></p> </div> <!-- id="about" --> </div> <!-- id="container" --> 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 6bb4aaa0028..4ecad4bd7bb 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/license.html +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/license.html @@ -1,6 +1,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <title>LuaFileSystem</title> <link rel="stylesheet" href="http://www.keplerproject.org/doc.css" type="text/css"/> @@ -39,6 +39,7 @@ <li><a href="manual.html">Manual</a> <ul> <li><a href="manual.html#introduction">Introduction</a></li> + <li><a href="manual.html#building">Building</a></li> <li><a href="manual.html#installation">Installation</a></li> <li><a href="manual.html#reference">Reference</a></li> </ul> @@ -84,7 +85,7 @@ Ierusalimschy, André Carregal and Tomás Guisasola. The implementation is not derived from licensed software.</p> <hr/> -<p>Copyright © 2004-2006 The Kepler Project.</p> +<p>Copyright © 2003 Kepler Project.</p> <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -111,9 +112,8 @@ SOFTWARE.</p> </div> <!-- id="main" --> <div id="about"> - <p><a href="http://validator.w3.org/check?uri=referer"> - <img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p> - <p><small>$Id: license.html,v 1.9 2006/03/14 14:07:55 carregal Exp $</small></p> + <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/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/manual.html b/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/manual.html index 281c06ea407..efae2363359 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/manual.html +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/doc/us/manual.html @@ -1,6 +1,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <title>LuaFileSystem</title> <link rel="stylesheet" href="http://www.keplerproject.org/doc.css" type="text/css"/> @@ -37,6 +37,7 @@ <li><strong>Manual</strong> <ul> <li><a href="manual.html#introduction">Introduction</a></li> + <li><a href="manual.html#building">Building</a></li> <li><a href="manual.html#installation">Installation</a></li> <li><a href="manual.html#reference">Reference</a></li> </ul> @@ -63,20 +64,32 @@ systems offered by the standard Lua distribution.</p> <p>LuaFileSystem offers a portable way to access the underlying directory structure and file attributes.</p> +<h2><a name="building"></a>Building</h2> + +<p> +LuaFileSystem should be built with Lua 5.1 so the language library +and header files for the target version must be installed properly. +</p> + +<p> +LuaFileSystem offers a Makefile and a separate configuration file, +<code>config</code>, +which should be edited to suit your installation before running +<code>make</code>. +The file has some definitions like paths to the external libraries, +compiler options and the like. +</p> + <h2><a name="installation"></a>Installation</h2> -<p>LuaFileSystem follows the -<a href="http://www.keplerproject.org/compat/">package model</a> -for Lua 5.1, therefore it should be "installed". Refer to -<a href="http://www.keplerproject.org/compat/manual.html#configuration"> -Compat-5.1 configuration</a> section about how to install the compiled -binary properly. -The compiled binary should be copied to a directory in your -<code>LUA_CPATH</code>.</p> +<p>The easiest way to install LuaFileSystem is to use LuaRocks:</p> + +<pre class="example"> +luarocks install luafilesystem +</pre> -<p>Windows users can use the binary version of LuaFileSystem -(<code>lfs.dll</code>) available at -<a href="http://luaforge.net/projects/luafilesystem/files">LuaForge</a>.</p> +<p>If you prefer to install LuaFileSystem manually, the compiled binary should be copied to a directory in your +<a href="http://www.lua.org/manual/5.1/manual.html#pdf-package.cpath">C path</a>.</p> <h2><a name="reference"></a>Reference</h2> @@ -96,7 +109,7 @@ LuaFileSystem offers the following functions: The attributes are described as follows; attribute <code>mode</code> is a string, all the others are numbers, and the time related attributes use the same time reference of - <a href="http://www.lua.org/manual/5.0/manual.html#5.7"><code>os.time</code></a>: + <a href="http://www.lua.org/manual/5.1/manual.html#pdf-os.time"><code>os.time</code></a>: <dl> <dt><strong><code>dev</code></strong></dt> <dd>on Unix systems, this represents the device that the inode resides on. On Windows systems, @@ -142,6 +155,12 @@ LuaFileSystem offers the following functions: <dt><strong><code>blksize</code></strong></dt> <dd>optimal file system I/O blocksize; (Unix only)</dd> </dl> + This function uses <code>stat</code> internally thus if the given + <code>filepath</code> is a symbolic link, it is followed (if it points to + another link the chain is followed recursively) and the information + is about the file it refers to. + To obtain information about the link itself, see function + <a href="#symlinkattributes">lfs.symlinkattributes</a>. </dd> <dt><a name="chdir"></a><strong><code>lfs.chdir (path)</code></strong></dt> @@ -157,8 +176,8 @@ LuaFileSystem offers the following functions: <dt><a name="dir"></a><strong><code>lfs.dir (path)</code></strong></dt> <dd> Lua iterator over the entries of a given directory. - Each time the iterator is called it returns a string with an entry of the - directory; <code>nil</code> is returned when there is no more entries. + Each time the iterator is called it returns a directory entry's name as a string, or + <code>nil</code> if there are no more entries. Raises an error if <code>path</code> is not a directory. </dd> @@ -185,14 +204,27 @@ LuaFileSystem offers the following functions: <dd>Removes an existing directory. The argument is the name of the directory.<br /> Returns <code>true</code> if the operation was successful; in case of error, it returns <code>nil</code> plus an error string.</dd> + + <dt><a name="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>. + Returns the previous mode string for the file. This function is only available in Windows, so you may want to make sure that + <code>lfs.setmode</code> exists before using it. + </dd> + <dt><a name="symlinkattributes"></a><strong><code>lfs.symlinkattributes (filepath [, aname])</code></strong></dt> + <dd>Identical to <a href="#attributes">lfs.attributes</a> except that + it obtains information about the link itself (not the file it refers to). + This function is not available in Windows so you may want to make sure that + <code>lfs.symlinkattributes</code> exists before using it. + </dd> + <dt><a name="touch"></a><strong><code>lfs.touch (filepath [, atime [, mtime]])</code></strong></dt> <dd>Set access and modification times of a file. This function is a bind to <code>utime</code> function. The first argument is the filename, the second argument (<code>atime</code>) is the access time, and the third argument (<code>mtime</code>) is the modification time. Both times are provided in seconds (which should be generated with - Lua standard function <code>os.date</code>). + 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; @@ -215,9 +247,8 @@ LuaFileSystem offers the following functions: </div> <!-- id="main" --> <div id="about"> - <p><a href="http://validator.w3.org/check?uri=referer"> - <img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p> - <p><small>$Id: manual.html,v 1.30.2.1 2006/03/15 20:30:53 carregal Exp $</small></p> + <p><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a></p> + <p><small>$Id: manual.html,v 1.42 2008/03/24 18:17:59 carregal Exp $</small></p> </div> <!-- id="about" --> </div> <!-- id="container" --> diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.c b/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.c index eea8bfaca83..ea9aea6f69c 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.c +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.c @@ -1,6 +1,6 @@ /* ** LuaFileSystem -** Copyright Kepler Project 2004-2006 (http://www.keplerproject.org/luafilesystem) +** Copyright Kepler Project 2003 (http://www.keplerproject.org/luafilesystem) ** ** File system manipulation library. ** This library offers these functions: @@ -11,15 +11,20 @@ ** lfs.lock (fh, mode) ** lfs.mkdir (path) ** lfs.rmdir (path) +** lfs.setmode (filepath, mode) +** lfs.symlinkattributes (filepath [, attributename]) -- thanks to Sam Roberts ** lfs.touch (filepath [, atime [, mtime]]) ** lfs.unlock (fh) ** -** $Id: lfs.c,v 1.32 2006/03/14 13:39:38 tomas Exp $ +** $Id: lfs.c,v 1.53 2008/05/07 19:06:37 carregal Exp $ */ +#define _LARGEFILE64_SOURCE + #include <errno.h> #include <stdio.h> #include <string.h> +#include <stdlib.h> #include <time.h> #include <sys/stat.h> @@ -28,6 +33,7 @@ #include <io.h> #include <sys/locking.h> #include <sys/utime.h> +#include <fcntl.h> #else #include <unistd.h> #include <dirent.h> @@ -39,8 +45,6 @@ #include "lua.h" #include "lauxlib.h" #include "lualib.h" -/* #include "compat-5.1.h"*/ - #include "lfs.h" /* Define 'strerror' for systems that do not implement it */ @@ -69,6 +73,26 @@ typedef struct dir_data { } dir_data; +#ifdef _WIN32 +#define lfs_setmode(L,file,m) ((void)L, _setmode(_fileno(file), m)) +#define STAT_STRUCT struct _stati64 +#define STAT_FUNC _stati64 +#else +#define _O_TEXT 0 +#define _O_BINARY 0 +#define lfs_setmode(L,file,m) ((void)((void)file,m), \ + luaL_error(L, LUA_QL("setmode") " not supported on this platform"), -1) +#ifdef HAVE_STAT64 +#define STAT_STRUCT struct stat64 +#define STAT_FUNC stat64 +#define LSTAT_FUNC lstat64 +#else +#define STAT_STRUCT struct stat +#define STAT_FUNC stat +#define LSTAT_FUNC lstat +#endif +#endif + /* ** This function changes the working (current) directory */ @@ -91,16 +115,17 @@ static int change_dir (lua_State *L) { ** and a string describing the error */ static int get_dir (lua_State *L) { - char path[255+2]; - if (getcwd(path, 255) == NULL) { - lua_pushnil(L); - lua_pushstring(L, getcwd_error); - return 2; - } - else { - lua_pushstring(L, path); - return 1; - } + char *path; + if ((path = getcwd(NULL, 0)) == NULL) { + lua_pushnil(L); + lua_pushstring(L, getcwd_error); + return 2; + } + else { + lua_pushstring(L, path); + free(path); + return 1; + } } /* @@ -165,6 +190,43 @@ static int _file_lock (lua_State *L, FILE *fh, const char *mode, const long star return (code != -1); } +#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}; + int op = luaL_checkoption(L, arg, NULL, modenames); + int res = lfs_setmode(L, 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; + } + } + 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; + } +} +#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); +} /* ** Locks a file. @@ -406,14 +468,13 @@ static const char *mode2string (mode_t mode) { return "other"; } - -/* + /* ** Convert the inode protection mode to a permission list. */ #ifdef _WIN32 static const char *perm2string (unsigned short mode) { - char perms[10] = "---------\0"; + static char perms[10] = "---------\0"; if (mode & _S_IREAD) { perms[0] = 'r'; perms[3] = 'r'; perms[6] = 'r'; } if (mode & _S_IWRITE) @@ -424,7 +485,7 @@ static const char *perm2string (unsigned short mode) { } #else static const char *perm2string (mode_t mode) { - char perms[10] = "---------\0"; + static char perms[10] = "---------\0"; if (mode & S_IRUSR) perms[0] = 'r'; if (mode & S_IWUSR) perms[1] = 'w'; if (mode & S_IXUSR) perms[2] = 'x'; @@ -438,7 +499,6 @@ static const char *perm2string (mode_t mode) { } #endif - /* ** Set access time and modification values for file */ @@ -464,66 +524,71 @@ static int file_utime (lua_State *L) { /* inode protection mode */ -static void push_st_mode (lua_State *L, struct stat *info) { +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, struct stat *info) { +static void push_st_dev (lua_State *L, STAT_STRUCT *info) { lua_pushnumber (L, (lua_Number)info->st_dev); } /* inode's number */ -static void push_st_ino (lua_State *L, struct stat *info) { +static void push_st_ino (lua_State *L, STAT_STRUCT *info) { lua_pushnumber (L, (lua_Number)info->st_ino); } /* number of hard links to the file */ -static void push_st_nlink (lua_State *L, struct stat *info) { +static void push_st_nlink (lua_State *L, STAT_STRUCT *info) { lua_pushnumber (L, (lua_Number)info->st_nlink); } /* user-id of owner */ -static void push_st_uid (lua_State *L, struct stat *info) { +static void push_st_uid (lua_State *L, STAT_STRUCT *info) { lua_pushnumber (L, (lua_Number)info->st_uid); } /* group-id of owner */ -static void push_st_gid (lua_State *L, struct stat *info) { +static void push_st_gid (lua_State *L, STAT_STRUCT *info) { lua_pushnumber (L, (lua_Number)info->st_gid); } /* device type, for special file inode */ -static void push_st_rdev (lua_State *L, struct stat *info) { +static void push_st_rdev (lua_State *L, STAT_STRUCT *info) { lua_pushnumber (L, (lua_Number)info->st_rdev); } /* time of last access */ -static void push_st_atime (lua_State *L, struct stat *info) { +static void push_st_atime (lua_State *L, STAT_STRUCT *info) { lua_pushnumber (L, info->st_atime); } /* time of last data modification */ -static void push_st_mtime (lua_State *L, struct stat *info) { +static void push_st_mtime (lua_State *L, STAT_STRUCT *info) { lua_pushnumber (L, info->st_mtime); } /* time of last file status change */ -static void push_st_ctime (lua_State *L, struct stat *info) { +static void push_st_ctime (lua_State *L, STAT_STRUCT *info) { lua_pushnumber (L, info->st_ctime); } /* file size, in bytes */ -static void push_st_size (lua_State *L, struct stat *info) { +static void push_st_size (lua_State *L, STAT_STRUCT *info) { lua_pushnumber (L, (lua_Number)info->st_size); } /* permssions string */ static void push_st_perm (lua_State *L, struct stat *info) { lua_pushstring (L, perm2string (info->st_mode)); } - #ifndef _WIN32 /* blocks allocated for file */ -static void push_st_blocks (lua_State *L, struct stat *info) { +static void push_st_blocks (lua_State *L, STAT_STRUCT *info) { lua_pushnumber (L, (lua_Number)info->st_blocks); } /* optimal file system I/O blocksize */ -static void push_st_blksize (lua_State *L, struct stat *info) { +static void push_st_blksize (lua_State *L, STAT_STRUCT *info) { lua_pushnumber (L, (lua_Number)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 +} -typedef void (*_push_function) (lua_State *L, struct stat *info); +typedef void (*_push_function) (lua_State *L, STAT_STRUCT *info); struct _stat_members { const char *name; @@ -547,18 +612,18 @@ struct _stat_members members[] = { { "blocks", push_st_blocks }, { "blksize", push_st_blksize }, #endif - { NULL, NULL } + { NULL, push_invalid } }; /* -** Get file information +** Get file or symbolic link information */ -static int file_info (lua_State *L) { +static int _file_info_ (lua_State *L, int (*st)(const char*, STAT_STRUCT*)) { int i; - struct stat info; + STAT_STRUCT info; const char *file = luaL_checkstring (L, 1); - if (stat(file, &info)) { + if (st(file, &info)) { lua_pushnil (L); lua_pushfstring (L, "cannot obtain information from file `%s'", file); return 2; @@ -568,6 +633,7 @@ static int file_info (lua_State *L) { 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 */ @@ -591,6 +657,30 @@ static int file_info (lua_State *L) { /* +** Get file information using stat. +*/ +static int file_info (lua_State *L) { + return _file_info_ (L, STAT_FUNC); +} + + +/* +** Get symbolic link information using lstat. +*/ +#ifndef _WIN32 +static int link_info (lua_State *L) { + return _file_info_ (L, LSTAT_FUNC); +} +#else +static int link_info (lua_State *L) { + lua_pushboolean(L, 0); + lua_pushliteral(L, "symlinkattributes not supported on this platform"); + return 2; +} +#endif + + +/* ** Get file information */ static int file_is_directory (lua_State *L) { @@ -634,13 +724,13 @@ static int file_is_file (lua_State *L) { */ static void set_info (lua_State *L) { lua_pushliteral (L, "_COPYRIGHT"); - lua_pushliteral (L, "Copyright (C) 2003-2006 Kepler Project"); + lua_pushliteral (L, "Copyright (C) 2003 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.2"); + lua_pushliteral (L, "LuaFileSystem 1.4.1"); lua_settable (L, -3); } @@ -655,6 +745,8 @@ static const struct luaL_reg fslib[] = { {"lock", file_lock}, {"mkdir", make_dir}, {"rmdir", remove_dir}, + {"symlinkattributes", link_info}, + {"setmode", lfs_f_setmode}, {"touch", file_utime}, {"unlock", file_unlock}, {NULL, NULL}, @@ -662,7 +754,7 @@ static const struct luaL_reg fslib[] = { int luaopen_lfs (lua_State *L) { dir_create_meta (L); - luaL_openlib (L, "lfs", fslib, 0); + luaL_register (L, "lfs", fslib); 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 new file mode 100644 index 00000000000..978ee6e60f9 --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.def @@ -0,0 +1,5 @@ +LIBRARY lfs.dll
+DESCRIPTION "LuaFileSystem"
+VERSION 1.4.1
+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 62ae79fa96c..4b52780bb3f 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.h +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.h @@ -1,8 +1,8 @@ /* ** LuaFileSystem -** Copyright Kepler Project 2004-2006 (http://www.keplerproject.org/luafilesystem) +** Copyright Kepler Project 2003 (http://www.keplerproject.org/luafilesystem) ** -** $Id: lfs.h,v 1.3 2006/03/10 23:37:32 carregal Exp $ +** $Id: lfs.h,v 1.5 2008/02/19 20:08:23 mascarenhas Exp $ */ /* Define 'chdir' for systems that do not implement it */ @@ -13,4 +13,5 @@ #define chdir_error strerror(errno) #endif + int luaopen_lfs (lua_State *L); diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/tests/test.lua b/Build/source/texk/web2c/luatexdir/luafilesystem/tests/test.lua index 66ec52a2f8b..1fd6157a7b9 100644 --- a/Build/source/texk/web2c/luatexdir/luafilesystem/tests/test.lua +++ b/Build/source/texk/web2c/luatexdir/luafilesystem/tests/test.lua @@ -1,80 +1,113 @@ -#!/usr/local/bin/lua50
-
-local tmp = "/tmp"
-local sep = "/"
-local upper = ".."
-
-require"lfs"
-
-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
-end
-
--- Checking changing directories
-local current = assert (lfs.currentdir())
-local reldir = string.gsub (current, "^.*%"..sep.."([^"..sep.."])$", "%1")
-assert (lfs.chdir (upper), "could not change to upper directory")
-assert (lfs.chdir (reldir), "could not change back to current directory")
-assert (lfs.currentdir() == current, "error trying to change directories")
-assert (lfs.chdir ("this couldn't be an actual directory") == nil, "could change to a non-existent directory")
-
--- Changing creating and removing directories
-local tmpdir = tmp..sep.."lfs_tmp_dir"
-local tmpfile = tmpdir..sep.."tmp_file"
-assert (lfs.mkdir (tmpdir), "could not make a new directory")
-local attrib, errmsg = lfs.attributes (tmpdir)
-if not attrib then
- error ("could not get attributes of file `"..tmpdir.."':\n"..errmsg)
-end
-local f = io.open(tmpfile, "w")
-f:close()
-
--- Change access time
-assert (lfs.touch (tmpfile, 86401))
-local new_att = assert (lfs.attributes (tmpfile))
-assert (new_att.access == 86401, "could not set access time")
-assert (new_att.modification == 86401, "could not set modification time")
-
--- Change access and modification time
-assert (lfs.touch (tmpfile, 86403, 86402))
-local new_att = assert (lfs.attributes (tmpfile))
-assert (new_att.access == 86403, "could not set access time")
-assert (new_att.modification == 86402, "could not set modification time")
-
--- Restore access time to current value
-assert (lfs.touch (tmpfile))
-new_att = assert (lfs.attributes (tmpfile))
-assert (new_att.access == attrib.access)
-assert (new_att.modification == attrib.modification)
-
--- 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")
-
--- Trying to get attributes of a non-existent file
-assert (lfs.attributes ("this couldn't be an actual file") == nil, "could get attributes of a non-existent file")
-assert (type(lfs.attributes (upper)) == "table", "couldn't get attributes of upper directory")
-
--- Stressing directory iterator
-count = 0
-for i = 1, 4000 do
- for file in lfs.dir (tmp) do
- count = count + 1
- end
-end
-print"Ok!"
+#!/usr/local/bin/lua5.1 + +local tmp = "/tmp" +local sep = "/" +local upper = ".." + +require"lfs" +print (lfs._VERSION) + +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 +end + +-- Checking changing directories +local current = assert (lfs.currentdir()) +local reldir = string.gsub (current, "^.*%"..sep.."([^"..sep.."])$", "%1") +assert (lfs.chdir (upper), "could not change to upper directory") +assert (lfs.chdir (reldir), "could not change back to current directory") +assert (lfs.currentdir() == current, "error trying to change directories") +assert (lfs.chdir ("this couldn't be an actual directory") == nil, "could change to a non-existent directory") + +-- Changing creating and removing directories +local tmpdir = current..sep.."lfs_tmp_dir" +local tmpfile = tmpdir..sep.."tmp_file" +-- Test for existence of a previous lfs_tmp_dir +-- 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 (lfs.rmdir (tmpdir), "could not remove directory from previous test") +end + +-- 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) +end +local f = io.open(tmpfile, "w") +f:close() + +-- Change access time +local testdate = os.time({ year = 2007, day = 10, month = 2, hour=0}) +assert (lfs.touch (tmpfile, testdate)) +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") + +-- 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}) + +assert (lfs.touch (tmpfile, testdate2, testdate1)) +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_") +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 + +-- 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) + +-- 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") + +-- Trying to get attributes of a non-existent file +assert (lfs.attributes ("this couldn't be an actual file") == nil, "could get attributes of a non-existent file") +assert (type(lfs.attributes (upper)) == "table", "couldn't get attributes of upper directory") + +-- Stressing directory iterator +count = 0 +for i = 1, 4000 do + for file in lfs.dir (tmp) do + count = count + 1 + end +end +print"Ok!" |