Packaging version 1.4.1

fixed bug 2293
2026-07-22 11:03:07 +00:00 · 2008-05-07 19:44:39 +00:00 · 2008-05-07 19:06:37 +00:00 · 2008-04-24 17:27:18 +00:00 · 2008-04-14 19:55:55 +00:00 · 2008-03-25 18:24:17 +00:00
19 changed files with 491 additions and 93 deletions
--- a/17
+++ b/17
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.30 2007/06/07 01:28:08 tomas Exp $
+# $Id: Makefile,v 1.34 2008/05/07 19:06:37 carregal Exp $

 T= lfs
-V= 1.3.0
+
 CONFIG= ./config

 include $(CONFIG)
@@ -9,15 +9,14 @@ include $(CONFIG)
 SRCS= src/$T.c
 OBJS= src/$T.o

-lib: src/$(LIBNAME)
+lib: src/lfs.so

-src/$(LIBNAME): $(OBJS)
-	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS)
+src/lfs.so: $(OBJS)
+	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/lfs.so $(OBJS)

-install: src/$(LIBNAME)
+install:
 	mkdir -p $(LUA_LIBDIR)
-	cp src/$(LIBNAME) $(LUA_LIBDIR)
-	cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
+	cp src/lfs.so $(LUA_LIBDIR)

 clean:
-	rm -f src/$(LIBNAME) $(OBJS)
+	rm -f src/lfs.so $(OBJS)
--- a/Makefile.win
+++ b/Makefile.win
@@ -1,24 +1,25 @@
-# $Id: Makefile.win,v 1.5 2007/08/30 14:38:07 tomas Exp $
+# $Id: Makefile.win,v 1.11 2008/05/07 19:06:37 carregal Exp $

 T= lfs
-V= 1.3.0

 include config.win

 SRCS= src\$T.c
 OBJS= src\$T.obj

-lib: src\$(LIBNAME)
+lib: src\lfs.dll

 .c.obj:
 	$(CC) /c /Fo$@ $(CFLAGS) $<

-src\$(LIBNAME): $(OBJS)
-	link /dll /def:src\$T.def /out:src\$(LIBNAME) $(OBJS) $(LUA_LIB)
+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\$(LIBNAME)
-	IF NOT EXIST $(LUA_LIBDIR) mkdir $(LUA_LIBDIR)
-	copy src\$(LIBNAME) $(LUA_LIBDIR)
+install: src\lfs.dll
+	IF NOT EXIST "$(LUA_LIBDIR)" mkdir "$(LUA_LIBDIR)"
+	copy src\lfs.dll "$(LUA_LIBDIR)"

 clean:
-	del src\$(LIBNAME) $(OBJS) src\$T.lib src\$T.exp
+	del src\lfs.dll $(OBJS) src\$T.lib src\$T.exp
+	IF EXIST src\lfs.dll.manifest del src\lfs.dll.manifest
--- a/16
+++ b/16
@@ -1,5 +1,5 @@
 LuaFileSystem - File System Library for Lua
-Copyright 2003-2007 Kepler Project
+Copyright 2003 Kepler Project
 http://www.keplerproject.org/luafilesystem

 Description
@@ -10,7 +10,15 @@ 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

-Current version is 1.3.0
+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
 -----------------
@@ -23,8 +31,8 @@ The last step may require root privileges.

 Windows Installation
 --------------------
-To install on Windows, please copy lfs.ddl to your package.cpath directory
+To install on Windows, please copy lfs.dll to your package.cpath directory

 Documentation
 -------------
-Please check the documentation at /doc/us/ for more information.
+Please check the documentation at /doc/us/ for more information.
--- a/config.win
+++ b/config.win
@@ -1,17 +1,19 @@
 # Installation directories
 # System's libraries directory (where binary libraries are installed)
-LUA_LIBDIR= c:\lua5.1
+LUA_LIBDIR= "c:\lua5.1"
+
 # Lua includes directory
-LUA_INC= c:\lua5.1\include
+LUA_INC= "c:\lua5.1\include"
+
 # Lua library
-LUA_LIB= c:\lua5.1\lua5.1.lib
+LUA_LIB= "c:\lua5.1\lua5.1.lib"

 LIBNAME= $T.dll

 # Compilation directives
 WARN= /O2
 INCS= /I$(LUA_INC)
-CFLAGS= $(WARN) $(INCS)
+CFLAGS= /MD $(WARN) $(INCS)
 CC= cl

-# $Id: config.win,v 1.4 2007/05/18 19:52:59 carregal Exp $
+# $Id: config.win,v 1.7 2008/03/25 17:39:29 mascarenhas Exp $
--- a/doc/us/examples.html
+++ b/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"/>
@@ -94,7 +94,7 @@ attrdir (".")

 <div id="about">
 	<p><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a></p>
-	<p><small>$Id: examples.html,v 1.7 2007/10/26 21:44:43 carregal Exp $</small></p>
+	<p><small>$Id: examples.html,v 1.8 2007/12/14 15:28:04 carregal Exp $</small></p>
 </div> <!-- id="about" -->

 </div> <!-- id="container" -->
--- a/doc/us/index.html
+++ b/doc/us/index.html
@@ -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"/>
@@ -71,20 +71,43 @@ the underlying directory structure and file attributes.</p>

 <h2><a name="status"></a>Status</h2>

-<p>Current version is 1.3.0. It was developed for Lua 5.1.</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> 5.1.2 a Windows binary
-version of LuaFileSystem can be found at the same 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.3.0</strong> [26/Oct/2007]</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&amp;group_id=66&amp;aid=2185&amp;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
@@ -107,14 +130,14 @@ version of LuaFileSystem can be found at the same LuaForge page.</p>
        <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>

@@ -147,7 +170,7 @@ Comments are welcome!</p>

 <div id="about">
 	<p><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a></p>
-	<p><small>$Id: index.html,v 1.37 2007/10/26 21:44:43 carregal Exp $</small></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" -->
--- a/doc/us/license.html
+++ b/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"/>
@@ -85,7 +85,7 @@ Ierusalimschy, Andr&eacute; Carregal and Tom&aacute;s Guisasola.
 The implementation is not derived from licensed software.</p>

 <hr/>
-<p>Copyright &copy; 2004-2007 Kepler Project.</p>
+<p>Copyright &copy; 2003 Kepler Project.</p>

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

 <div id="about">
 	<p><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a></p>
-	<p><small>$Id: license.html,v 1.11 2007/10/26 21:44:43 carregal Exp $</small></p>
+	<p><small>$Id: license.html,v 1.13 2008/02/11 22:42:21 carregal Exp $</small></p>
 </div><!-- id="about" -->

 </div><!-- id="container" -->
--- a/doc/us/manual.html
+++ b/doc/us/manual.html
@@ -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"/>
@@ -74,7 +74,7 @@ and header files for the target version must be installed properly.
 <p>
 LuaFileSystem offers a Makefile and a separate configuration file,
 <code>config</code>,
-which should be edited to suit your installation before runnig
+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.
@@ -82,12 +82,14 @@ compiler options and the like.

 <h2><a name="installation"></a>Installation</h2>

-<p>The LuaFileSystem 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>
+<p>The easiest way to install LuaFileSystem is to use LuaRocks:</p>

-<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>
+<pre class="example">
+luarocks install luafilesystem
+</pre>
+
+<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>

@@ -174,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>
    
@@ -202,6 +204,12 @@ 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
@@ -240,7 +248,7 @@ LuaFileSystem offers the following functions:

 <div id="about">
 	<p><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a></p>
-	<p><small>$Id: manual.html,v 1.37 2007/10/26 21:44:43 carregal Exp $</small></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" -->
--- a/rockspecs/luafilesystem-1.3.0-1.rockspec
+++ b/rockspecs/luafilesystem-1.3.0-1.rockspec
@@ -0,0 +1,27 @@
+package = "LuaFileSystem"
+version = "1.3.0-1"
+source = {
+   url = "http://luaforge.net/frs/download.php/2679/luafilesystem-1.3.0.tar.gz"
+}
+description = {
+   summary = "File System Library for the Lua Programming Language",
+   detailed = [[
+      LuaFileSystem is a Lua library developed to complement the set of
+      functions related to file systems offered by the standard Lua
+      distribution. LuaFileSystem offers a portable way to access the
+      underlying directory structure and file attributes.
+   ]]
+}
+dependencies = {
+   "lua >= 5.1"
+}
+build = {
+   type = "make",
+   build_variables = {
+      LUA_INC = "$(LUA_INCDIR)",
+      LIB_OPTION = "$(LIBFLAG)"
+   },
+   install_variables = {
+      LUA_LIBDIR = "$(LIBDIR)"
+   }
+}
--- a/rockspecs/luafilesystem-1.4.0-1.rockspec
+++ b/rockspecs/luafilesystem-1.4.0-1.rockspec
@@ -0,0 +1,27 @@
+package = "LuaFileSystem"
+version = "1.4.0-1"
+source = {
+   url = "http://luaforge.net/frs/download.php/3158/luafilesystem-1.4.0.tar.gz"
+}
+description = {
+   summary = "File System Library for the Lua Programming Language",
+   detailed = [[
+      LuaFileSystem is a Lua library developed to complement the set of
+      functions related to file systems offered by the standard Lua
+      distribution. LuaFileSystem offers a portable way to access the
+      underlying directory structure and file attributes.
+   ]]
+}
+dependencies = {
+   "lua >= 5.1"
+}
+build = {
+   type = "make",
+   build_variables = {
+      LUA_INC = "$(LUA_INCDIR)",
+      LIB_OPTION = "$(LIBFLAG)"
+   },
+   install_variables = {
+      LUA_LIBDIR = "$(LIBDIR)"
+   }
+}
--- a/rockspecs/luafilesystem-1.4.0-2.rockspec
+++ b/rockspecs/luafilesystem-1.4.0-2.rockspec
@@ -0,0 +1,43 @@
+package = "LuaFileSystem"
+version = "1.4.0-2"
+source = {
+   url = "http://luaforge.net/frs/download.php/3158/luafilesystem-1.4.0.tar.gz"
+}
+description = {
+   summary = "File System Library for the Lua Programming Language",
+   detailed = [[
+      LuaFileSystem is a Lua library developed to complement the set of
+      functions related to file systems offered by the standard Lua
+      distribution. LuaFileSystem offers a portable way to access the
+      underlying directory structure and file attributes.
+   ]]
+}
+dependencies = {
+   "lua >= 5.1"
+}
+build = {
+   platforms = {
+     unix = {
+        type = "make",
+       	build_variables = {
+         LIB_OPTION = "$(LIBFLAG)",
+         CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)"
+       	}
+     },
+     win32 = {
+        type = "make",
+       	build_variables = {
+         LUA_LIB = "$(LUA_LIBDIR)\\lua5.1.lib",
+         CFLAGS = "/MD $(CFLAGS) /I$(LUA_INCDIR)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)",
+         LUA_DIR = "$(LUADIR)",
+	 	 BIN_DIR = "$(BINDIR)"
+       	}
+     }
+  }
+}
--- a/rockspecs/luafilesystem-1.4.1-1.rockspec
+++ b/rockspecs/luafilesystem-1.4.1-1.rockspec
@@ -0,0 +1,43 @@
+package = "LuaFileSystem"
+version = "1.4.1-1"
+source = {
+   url = "",
+}
+description = {
+   summary = "File System Library for the Lua Programming Language",
+   detailed = [[
+      LuaFileSystem is a Lua library developed to complement the set of
+      functions related to file systems offered by the standard Lua
+      distribution. LuaFileSystem offers a portable way to access the
+      underlying directory structure and file attributes.
+   ]]
+}
+dependencies = {
+   "lua >= 5.1"
+}
+build = {
+   platforms = {
+     unix = {
+        type = "make",
+       	build_variables = {
+         LIB_OPTION = "$(LIBFLAG)",
+         CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR) $(STAT64)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)"
+       	}
+     },
+     win32 = {
+        type = "make",
+       	build_variables = {
+         LUA_LIB = "$(LUA_LIBDIR)\\lua5.1.lib",
+         CFLAGS = "/MD $(CFLAGS) /I$(LUA_INCDIR)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)",
+         LUA_DIR = "$(LUADIR)",
+	 	 BIN_DIR = "$(BINDIR)"
+       	}
+     }
+  }
+}
--- a/rockspecs/luafilesystem-1.4.1rc1-1.rockspec
+++ b/rockspecs/luafilesystem-1.4.1rc1-1.rockspec
@@ -0,0 +1,43 @@
+package = "LuaFileSystem"
+version = "1.4.1rc1-1"
+source = {
+   url = "http://luafilesystem.luaforge.net/luafilesystem-1.4.1rc1.tar.gz",
+}
+description = {
+   summary = "File System Library for the Lua Programming Language",
+   detailed = [[
+      LuaFileSystem is a Lua library developed to complement the set of
+      functions related to file systems offered by the standard Lua
+      distribution. LuaFileSystem offers a portable way to access the
+      underlying directory structure and file attributes.
+   ]]
+}
+dependencies = {
+   "lua >= 5.1"
+}
+build = {
+   platforms = {
+     unix = {
+        type = "make",
+       	build_variables = {
+         LIB_OPTION = "$(LIBFLAG)",
+         CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR) $(STAT64)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)"
+       	}
+     },
+     win32 = {
+        type = "make",
+       	build_variables = {
+         LUA_LIB = "$(LUA_LIBDIR)\\lua5.1.lib",
+         CFLAGS = "/MD $(CFLAGS) /I$(LUA_INCDIR)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)",
+         LUA_DIR = "$(LUADIR)",
+	 	 BIN_DIR = "$(BINDIR)"
+       	}
+     }
+  }
+}
--- a/rockspecs/luafilesystem-cvs-1.rockspec
+++ b/rockspecs/luafilesystem-cvs-1.rockspec
@@ -0,0 +1,44 @@
+package = "LuaFileSystem"
+version = "cvs-1"
+source = {
+   url = "cvs://:pserver:anonymous:@cvs.luaforge.net:/cvsroot/luafilesystem",
+   cvs_tag = "HEAD"
+}
+description = {
+   summary = "File System Library for the Lua Programming Language",
+   detailed = [[
+      LuaFileSystem is a Lua library developed to complement the set of
+      functions related to file systems offered by the standard Lua
+      distribution. LuaFileSystem offers a portable way to access the
+      underlying directory structure and file attributes.
+   ]]
+}
+dependencies = {
+   "lua >= 5.1"
+}
+build = {
+   platforms = {
+     unix = {
+        type = "make",
+       	build_variables = {
+         LIB_OPTION = "$(LIBFLAG)",
+         CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)"
+       	}
+     },
+     win32 = {
+        type = "make",
+       	build_variables = {
+         LUA_LIB = "$(LUA_LIBDIR)\\lua5.1.lib",
+         CFLAGS = "$(CFLAGS) /I$(LUA_INCDIR)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)",
+         LUA_DIR = "$(LUADIR)",
+	 BIN_DIR = "$(BINDIR)"
+       	}
+     }
+  }
+}
--- a/rockspecs/luafilesystem-cvs-2.rockspec
+++ b/rockspecs/luafilesystem-cvs-2.rockspec
@@ -0,0 +1,44 @@
+package = "LuaFileSystem"
+version = "cvs-2"
+source = {
+   url = "cvs://:pserver:anonymous:@cvs.luaforge.net:/cvsroot/luafilesystem",
+   cvs_tag = "HEAD"
+}
+description = {
+   summary = "File System Library for the Lua Programming Language",
+   detailed = [[
+      LuaFileSystem is a Lua library developed to complement the set of
+      functions related to file systems offered by the standard Lua
+      distribution. LuaFileSystem offers a portable way to access the
+      underlying directory structure and file attributes.
+   ]]
+}
+dependencies = {
+   "lua >= 5.1"
+}
+build = {
+   platforms = {
+     unix = {
+        type = "make",
+       	build_variables = {
+         LIB_OPTION = "$(LIBFLAG)",
+         CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR) $(STAT64)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)"
+       	}
+     },
+     win32 = {
+        type = "make",
+       	build_variables = {
+         LUA_LIB = "$(LUA_LIBDIR)\\lua5.1.lib",
+         CFLAGS = "/MD $(CFLAGS) /I$(LUA_INCDIR)",
+       	},
+       	install_variables = {
+         LUA_LIBDIR = "$(LIBDIR)",
+         LUA_DIR = "$(LUADIR)",
+	 	 BIN_DIR = "$(BINDIR)"
+       	}
+     }
+  }
+}
--- a/src/lfs.c
+++ b/src/lfs.c
@@ -1,6 +1,6 @@
 /*
 ** LuaFileSystem
-** Copyright Kepler Project 2004-2007 (http://www.keplerproject.org/luafilesystem)
+** Copyright Kepler Project 2003 (http://www.keplerproject.org/luafilesystem)
 **
 ** File system manipulation library.
 ** This library offers these functions:
@@ -11,16 +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.42 2007/10/26 21:01:07 carregal 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>

@@ -29,6 +33,7 @@
 #include <io.h>
 #include <sys/locking.h>
 #include <sys/utime.h>
+#include <fcntl.h>
 #else
 #include <unistd.h>
 #include <dirent.h>
@@ -68,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
 */
@@ -90,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;
+  }
 }

 /*
@@ -164,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.
@@ -431,61 +494,67 @@ 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);
 }
 #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;
@@ -508,15 +577,15 @@ struct _stat_members members[] = {
 	{ "blocks",       push_st_blocks },
 	{ "blksize",      push_st_blksize },
 #endif
-	{ NULL, NULL }
+	{ NULL, push_invalid }
 };

 /*
 ** Get file or symbolic link information
 */
-static int _file_info_ (lua_State *L, int (*st)(const char*, struct stat*)) {
+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 (st(file, &info)) {
@@ -556,7 +625,7 @@ static int _file_info_ (lua_State *L, int (*st)(const char*, struct stat*)) {
 ** Get file information using stat.
 */
 static int file_info (lua_State *L) {
-	return _file_info_ (L, stat);
+	return _file_info_ (L, STAT_FUNC);
 }


@@ -565,7 +634,13 @@ static int file_info (lua_State *L) {
 */
 #ifndef _WIN32
 static int link_info (lua_State *L) {
-	return _file_info_ (L, lstat);
+	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

@@ -575,13 +650,13 @@ static int link_info (lua_State *L) {
 */
 static void set_info (lua_State *L) {
 	lua_pushliteral (L, "_COPYRIGHT");
-	lua_pushliteral (L, "Copyright (C) 2003-2007 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.3.0");
+	lua_pushliteral (L, "LuaFileSystem 1.4.1");
 	lua_settable (L, -3);
 }

@@ -594,9 +669,8 @@ static const struct luaL_reg fslib[] = {
 	{"lock", file_lock},
 	{"mkdir", make_dir},
 	{"rmdir", remove_dir},
-#ifndef _WIN32
 	{"symlinkattributes", link_info},
-#endif
+	{"setmode", lfs_f_setmode},
 	{"touch", file_utime},
 	{"unlock", file_unlock},
 	{NULL, NULL},
--- a/src/lfs.def
+++ b/src/lfs.def
@@ -1,5 +1,5 @@
-LIBRARY lfs.dll
-DESCRIPTION "LuaFileSystem"
-VERSION 1.2.1
-EXPORTS
-luaopen_lfs
+LIBRARY lfs.dll
+DESCRIPTION "LuaFileSystem"
+VERSION 1.4.1
+EXPORTS
+luaopen_lfs
--- a/src/lfs.h
+++ b/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);
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -69,7 +69,8 @@ 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")

-if lfs.symlinkattributes then
+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")
@@ -77,6 +78,16 @@ if lfs.symlinkattributes then
    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))
Author	SHA1	Message	Date
carregal	1e40455d39	Packaging version 1.4.1	2008-05-07 19:44:39 +00:00
carregal	d4bfd537a8	Packaging version 1.4.1	2008-05-07 19:06:37 +00:00
mascarenhas	d7a5679fb8	fixed bug 2293	2008-04-24 17:27:18 +00:00
mascarenhas	c039fc9798	added 1.4.1rc1 rockspec	2008-04-14 19:55:55 +00:00
mascarenhas	e7a2c5419f	* empty log message *	2008-03-25 18:24:17 +00:00
mascarenhas	baf658a721	large file support in Linux needs STAT64=-DHAVE_STAT64 in LuaRocks config	2008-03-25 18:20:29 +00:00
mascarenhas	5c8e92efa3	fixing config.win	2008-03-25 17:39:29 +00:00
mascarenhas	dac6b84eda	fixed config.win	2008-03-25 17:38:15 +00:00
mascarenhas	ca8efaa8e7	large file support in lfs.attributes (bug #2185 )	2008-03-25 16:58:29 +00:00
carregal	3aba7a98fb	Small revision by Reuben Thomas	2008-03-24 18:17:59 +00:00
carregal	0154141e3f	Fixed bug in the Windows tests (patch by Shmuel Zeigerman)	2008-03-10 15:28:50 +00:00
carregal	bb9cf83617	Correcting the use of the /MD flag	2008-02-19 22:07:42 +00:00
mascarenhas	c5bfbb1bd2	fixed windows compile problem	2008-02-19 20:08:23 +00:00
carregal	c2e720b5dc	Finishing the new rockspecs	2008-02-18 18:55:14 +00:00
carregal	0233beea30	New rockspec for lfs 1.4.0, this time including Windows rules	2008-02-18 18:17:05 +00:00
carregal	f1e4fd1bf4	Fixing wrong decription of lfs.setmode	2008-02-18 17:20:16 +00:00
mascarenhas	640265aee7	removed warnings	2008-02-18 03:13:50 +00:00
carregal	8f943857e8	Corecting the lfs.setmode signature	2008-02-14 18:26:19 +00:00
carregal	80027817c3	Updating rockspec to include the correct package URL	2008-02-13 22:33:47 +00:00
carregal	6c16dc4634	Correcting the detection of the manifest file	2008-02-13 22:08:31 +00:00
carregal	dff01ac3c9	Version 1.4.0 rockspec	2008-02-13 21:40:56 +00:00
carregal	cdfd06b4ea	Minor update	2008-02-13 21:00:10 +00:00
carregal	db7e8b9133	Adding tests for lfs.setmode	2008-02-13 20:59:51 +00:00
carregal	d931b9b2bb	Small corrections	2008-02-11 22:48:16 +00:00
carregal	b66ab2cae9	Preparing the 1.4.0 release. Added documentation for lfs.setmode	2008-02-11 22:42:21 +00:00
mascarenhas	78f28b6468	lfs.attributes raises an error if attribute does not exist	2008-01-25 17:09:56 +00:00
mascarenhas	25f8aa1936	makefile.win tweak	2008-01-23 02:50:08 +00:00
mascarenhas	804e976407	updated makefile for vc2008	2008-01-23 02:48:47 +00:00
mascarenhas	d219de7885	added flag to supress manifest creation	2008-01-23 01:58:25 +00:00
mascarenhas	ed97af80fb	* empty log message *	2008-01-16 22:33:24 +00:00
mascarenhas	895e9daf27	getcwd no longer passes a buffer	2008-01-16 22:29:26 +00:00
mascarenhas	50f17597b3	Added lfs.setmode for changing file's mode (only for Windows)	2007-12-22 17:19:45 +00:00
carregal	24fdbc0a66	Minor HTML revision	2007-12-14 15:28:04 +00:00