mirror of
https://github.com/lunarmodules/luafilesystem.git
synced 2026-07-22 11:03:07 +00:00
Compare commits
29 Commits
symlink_ta
...
fix-101
| Author | SHA1 | Date | |
|---|---|---|---|
|
f7eea62957 | ||
|
|
1b5073419f | ||
|
|
fe964e013d | ||
|
|
12d1692f14 | ||
|
|
de87218e97 | ||
|
|
a23cadf009 | ||
|
|
220d38c7d1 | ||
|
|
a066a03f1c | ||
|
|
d37fc8101a | ||
|
|
754576dee6 | ||
|
|
d399961536 | ||
|
|
8a7796ec17 | ||
|
|
dd6911ef15 | ||
|
|
55ed1b14ab | ||
|
|
a84d81bc52 | ||
|
|
a90ec38133 | ||
|
|
ee5942d810 | ||
|
|
3c4e563d9c | ||
|
|
50919ed69f | ||
|
|
4cf702d850 | ||
|
|
32b355a990 | ||
|
|
080f74f785 | ||
|
|
a332bde584 | ||
|
|
81e5b165bf | ||
|
|
8d5f9661e9 | ||
|
|
b37e88b3d6 | ||
|
|
8f167ef1de | ||
|
|
8b85d257a6 | ||
|
|
d186dda4d7 |
@@ -7,16 +7,16 @@ env:
|
||||
- LUA="lua 5.2"
|
||||
- LUA="lua 5.3"
|
||||
- LUA="luajit 2.0"
|
||||
- LUA="luajit 2.1"
|
||||
|
||||
before_install:
|
||||
- pip install --user cpp-coveralls hererocks
|
||||
- hererocks env --$LUA --luarocks latest
|
||||
- export PATH="$PWD/env/bin:$PATH"
|
||||
- luarocks install Lua-cURL --server=https://luarocks.org/dev
|
||||
- luarocks install lua-path
|
||||
- luarocks install lua-cjson
|
||||
- luarocks install dkjson
|
||||
- luarocks install luacov
|
||||
# install luacov-coveralls, but avoids installing luafilesystem
|
||||
# install luacov-coveralls, but avoid installing luafilesystem
|
||||
- luarocks install luacov-coveralls --server=https://luarocks.org/dev --deps-mode=none
|
||||
|
||||
install:
|
||||
|
||||
4
Makefile
4
Makefile
@@ -18,8 +18,8 @@ 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)
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
[](LICENCE.txt)
|
||||
[](LICENSE)
|
||||
[](https://travis-ci.org/keplerproject/luafilesystem)
|
||||
[](https://ci.appveyor.com/project/ignacio/luafilesystem)
|
||||
[](https://coveralls.io/r/keplerproject/luafilesystem)
|
||||
|
||||
# LuaFileSystem - File System Library for Lua
|
||||
Copyright 2003-2016 Kepler Project
|
||||
|
||||
http://keplerproject.github.io/luafilesystem
|
||||
Copyright 2003-2017 Kepler Project
|
||||
|
||||
https://keplerproject.github.io/luafilesystem
|
||||
|
||||
# Description
|
||||
|
||||
@@ -14,7 +15,7 @@ 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
|
||||
LuaFileSystem is free software and uses the same license as Lua 5.x (MIT).
|
||||
|
||||
# LuaRocks Installation
|
||||
|
||||
|
||||
305
doc/us/doc.css
305
doc/us/doc.css
@@ -1,182 +1,179 @@
|
||||
body {
|
||||
margin-left: 1em;
|
||||
margin-right: 1em;
|
||||
font-family: arial, helvetica, geneva, sans-serif;
|
||||
background-color:#ffffff; margin:0px;
|
||||
color: #47555c;
|
||||
font-size: 16px;
|
||||
font-family: "Open Sans", sans-serif;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
background: #eff4ff;
|
||||
}
|
||||
|
||||
a:link { color: #008fee; }
|
||||
a:visited { color: #008fee; }
|
||||
a:hover { color: #22a7ff; }
|
||||
|
||||
h1 { font-size:26px; }
|
||||
h2 { font-size:24px; }
|
||||
h3 { font-size:18px; }
|
||||
h4 { font-size:16px; }
|
||||
|
||||
hr {
|
||||
height: 1px;
|
||||
background: #c1cce4;
|
||||
border: 0px;
|
||||
margin: 20px 0;
|
||||
}
|
||||
|
||||
code {
|
||||
font-family: "Andale Mono", monospace;
|
||||
font-family: "Open Sans Mono", "Andale Mono", monospace;
|
||||
}
|
||||
|
||||
tt {
|
||||
font-family: "Andale Mono", monospace;
|
||||
font-family: "Open Sans Mono", "Andale Mono", monospace;
|
||||
}
|
||||
|
||||
body, td, th { font-size: 11pt; }
|
||||
|
||||
h1, h2, h3, h4 { margin-left: 0em; }
|
||||
|
||||
textarea, pre, tt { font-size:10pt; }
|
||||
body, td, th { color:#000000; }
|
||||
small { font-size:0.85em; }
|
||||
h1 { font-size:1.5em; }
|
||||
h2 { font-size:1.25em; }
|
||||
h3 { font-size:1.15em; }
|
||||
h4 { font-size:1.06em; }
|
||||
|
||||
a:link { font-weight:bold; color: #004080; text-decoration: none; }
|
||||
a:visited { font-weight:bold; color: #006699; text-decoration: none; }
|
||||
a:link:hover { text-decoration:underline; }
|
||||
hr { color:#cccccc }
|
||||
img { border-width: 0px; }
|
||||
|
||||
h3 { padding-top: 1em; }
|
||||
|
||||
p { margin-left: 1em; }
|
||||
|
||||
p.name {
|
||||
font-family: "Andale Mono", monospace;
|
||||
padding-top: 1em;
|
||||
margin-left: 0em;
|
||||
body, td, th {
|
||||
}
|
||||
|
||||
blockquote { margin-left: 3em; }
|
||||
textarea, pre, tt {
|
||||
font-family: "Open Sans Mono", "Andale Mono", monospace;
|
||||
}
|
||||
|
||||
img {
|
||||
border-width: 0px;
|
||||
}
|
||||
|
||||
.example {
|
||||
background-color: rgb(245, 245, 245);
|
||||
border-top-width: 1px;
|
||||
border-right-width: 1px;
|
||||
border-bottom-width: 1px;
|
||||
border-left-width: 1px;
|
||||
border-top-style: solid;
|
||||
border-right-style: solid;
|
||||
border-bottom-style: solid;
|
||||
border-left-style: solid;
|
||||
border-top-color: silver;
|
||||
border-right-color: silver;
|
||||
border-bottom-color: silver;
|
||||
border-left-color: silver;
|
||||
padding: 1em;
|
||||
margin-left: 1em;
|
||||
margin-right: 1em;
|
||||
font-family: "Andale Mono", monospace;
|
||||
font-size: smaller;
|
||||
background-color: #323744;
|
||||
color: white;
|
||||
font-size: 16px;
|
||||
padding: 16px 24px;
|
||||
border-radius: 2px;
|
||||
}
|
||||
|
||||
hr {
|
||||
margin-left: 0em;
|
||||
background: #00007f;
|
||||
border: 0px;
|
||||
height: 1px;
|
||||
div.header, div.footer {
|
||||
}
|
||||
|
||||
ul { list-style-type: disc; }
|
||||
#container {
|
||||
}
|
||||
|
||||
table.index { border: 1px #00007f; }
|
||||
table.index td { text-align: left; vertical-align: top; }
|
||||
table.index ul { padding-top: 0em; margin-top: 0em; }
|
||||
#product {
|
||||
background-color: white;
|
||||
padding: 10px;
|
||||
height: 130px;
|
||||
border-bottom: solid #d3dbec 1px;
|
||||
}
|
||||
|
||||
table {
|
||||
border: 1px solid black;
|
||||
border-collapse: collapse;
|
||||
#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;
|
||||
}
|
||||
|
||||
th {
|
||||
border: 1px solid black;
|
||||
padding: 0.5em;
|
||||
}
|
||||
|
||||
td {
|
||||
border: 1px solid black;
|
||||
padding: 0.5em;
|
||||
}
|
||||
div.header, div.footer { margin-left: 0em; }
|
||||
|
||||
#container {
|
||||
margin-left: 1em;
|
||||
margin-right: 1em;
|
||||
background-color: #f0f0f0;
|
||||
}
|
||||
|
||||
#product {
|
||||
text-align: center;
|
||||
border-bottom: 1px solid #cccccc;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
|
||||
#product big {
|
||||
font-size: 2em;
|
||||
}
|
||||
|
||||
#product_logo {
|
||||
}
|
||||
|
||||
#product_name {
|
||||
}
|
||||
|
||||
#product_description {
|
||||
}
|
||||
|
||||
#main {
|
||||
background-color: #f0f0f0;
|
||||
border-left: 2px solid #cccccc;
|
||||
}
|
||||
|
||||
#navigation {
|
||||
float: left;
|
||||
width: 12em;
|
||||
margin: 0;
|
||||
vertical-align: top;
|
||||
background-color: #f0f0f0;
|
||||
overflow:visible;
|
||||
}
|
||||
|
||||
#navigation h1 {
|
||||
background-color:#e7e7e7;
|
||||
font-size:1.1em;
|
||||
color:#000000;
|
||||
text-align:left;
|
||||
margin:0px;
|
||||
padding:0.2em;
|
||||
border-top:1px solid #dddddd;
|
||||
border-bottom:1px solid #dddddd;
|
||||
}
|
||||
|
||||
#navigation ul {
|
||||
font-size:1em;
|
||||
list-style-type: none;
|
||||
padding: 0;
|
||||
margin: 1px;
|
||||
}
|
||||
|
||||
#navigation li {
|
||||
text-indent: -1em;
|
||||
margin: 0em 0em 0em 0.5em;
|
||||
display: block;
|
||||
padding: 3px 0px 0px 12px;
|
||||
}
|
||||
|
||||
#navigation li li a {
|
||||
padding: 0px 3px 0px -1em;
|
||||
}
|
||||
|
||||
#content {
|
||||
margin-left: 12em;
|
||||
padding: 1em;
|
||||
border-left: 2px solid #cccccc;
|
||||
border-right: 2px solid #cccccc;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
|
||||
#about {
|
||||
clear: both;
|
||||
margin: 0;
|
||||
display: none;
|
||||
}
|
||||
|
||||
dl.reference {
|
||||
background-color: white;
|
||||
padding: 20px;
|
||||
border: solid #d3dbec 1px;
|
||||
}
|
||||
|
||||
dl.reference dt {
|
||||
padding: 5px;
|
||||
border-top: 2px solid #cccccc;
|
||||
background-color: #ffffff;
|
||||
padding-top: 25px;
|
||||
color: #637bbc;
|
||||
}
|
||||
|
||||
dl.reference dl dt {
|
||||
padding-top: 5px;
|
||||
color: #637383;
|
||||
}
|
||||
|
||||
dl.reference dd {
|
||||
}
|
||||
|
||||
@media print {
|
||||
|
||||
@@ -70,17 +70,30 @@ the underlying directory structure and file attributes.</p>
|
||||
|
||||
<h2><a name="status"></a>Status</h2>
|
||||
|
||||
<p>Current version is 1.6.3. It works with Lua 5.1, 5.2 and 5.3.</p>
|
||||
<p>Current version is 1.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.</p>
|
||||
|
||||
<h2><a name="download"></a>Download</h2>
|
||||
|
||||
<p>LuaFileSystem source can be downloaded from its
|
||||
<a href="http://github.com/keplerproject/luafilesystem">Github</a>
|
||||
page.</p>
|
||||
<p>LuaFileSystem can be installed using <a href="https://luarocks.org">LuaRocks</a>:
|
||||
|
||||
<pre class="example">
|
||||
$ luarocks install luafilesystem
|
||||
</pre>
|
||||
|
||||
<p>Its source can be found at its <a href="http://github.com/keplerproject/luafilesystem">Github</a> page.</p>
|
||||
|
||||
<h2><a name="history"></a>History</h2>
|
||||
|
||||
<dl class="history">
|
||||
<dt><strong>Version 1.7.0</strong> [15/Sep/2017]</dt>
|
||||
<dd><ul>
|
||||
<li>symlinkattributes function now provides 'target' field, containing name of the file that the symlink points to.</li>
|
||||
<li>attributes, symlinkattributes, touch, mkdir, and rmdir functions now return system-dependent error code as the third value on error.</li>
|
||||
<li>Fixed detection of closed files for Lua 5.2+ in setmode, lock, and unlock functions.</li>
|
||||
<li>Fixed various compiler warnings.</li>
|
||||
</ul></dd>
|
||||
|
||||
<dt><strong>Version 1.6.3</strong> [15/Jan/2015]</dt>
|
||||
<dd><ul>
|
||||
<li>Lua 5.3 support.</li>
|
||||
|
||||
@@ -84,7 +84,7 @@ Ierusalimschy, André Carregal and Tomás Guisasola.
|
||||
The implementation is not derived from licensed software.</p>
|
||||
|
||||
<hr/>
|
||||
<p>Copyright © 2003 Kepler Project.</p>
|
||||
<p>Copyright © 2003 - 2017 Kepler Project.</p>
|
||||
|
||||
<p>Permission is hereby granted, free of charge, to any person
|
||||
obtaining a copy of this software and associated documentation
|
||||
|
||||
@@ -104,7 +104,7 @@ LuaFileSystem offers the following functions:
|
||||
<dl class="reference">
|
||||
<dt><a name="attributes"></a><strong><code>lfs.attributes (filepath [, aname | atable])</code></strong></dt>
|
||||
<dd>Returns a table with the file attributes corresponding to
|
||||
<code>filepath</code> (or <code>nil</code> followed by an error message
|
||||
<code>filepath</code> (or <code>nil</code> followed by an error message and a system-dependent error code
|
||||
in case of error).
|
||||
If the second optional argument is given and is a string, then only the value of the
|
||||
named attribute is returned (this use is equivalent to
|
||||
@@ -177,7 +177,7 @@ LuaFileSystem offers the following functions:
|
||||
Returns <code>true</code> in case of success or <code>nil</code> plus an
|
||||
error string.</dd>
|
||||
|
||||
<dt><a name="chdir"></a><strong><code>lfs.lock_dir(path, [seconds_stale])</code></strong></dt>
|
||||
<dt><a name="lock_dir"></a><strong><code>lfs.lock_dir(path, [seconds_stale])</code></strong></dt>
|
||||
<dd>Creates a lockfile (called lockfile.lfs) in <code>path</code> if it does not
|
||||
exist and returns the lock. If the lock already exists checks if
|
||||
it's stale, using the second parameter (default for the second
|
||||
@@ -187,7 +187,7 @@ LuaFileSystem offers the following functions:
|
||||
particular, if the lock exists and is not stale it returns the
|
||||
"File exists" message.</dd>
|
||||
|
||||
<dt><a name="getcwd"></a><strong><code>lfs.currentdir ()</code></strong></dt>
|
||||
<dt><a name="currentdir"></a><strong><code>lfs.currentdir ()</code></strong></dt>
|
||||
<dd>Returns a string with the current working directory or <code>nil</code>
|
||||
plus an error string.</dd>
|
||||
|
||||
@@ -222,14 +222,14 @@ LuaFileSystem offers the following functions:
|
||||
<dt><a name="mkdir"></a><strong><code>lfs.mkdir (dirname)</code></strong></dt>
|
||||
<dd>Creates a new directory. The argument is the name of the new
|
||||
directory.<br />
|
||||
Returns <code>true</code> if the operation was successful;
|
||||
in case of error, it returns <code>nil</code> plus an error string.
|
||||
Returns <code>true</code> in case of success or <code>nil</code>, an error message and
|
||||
a system-dependent error code in case of error.
|
||||
</dd>
|
||||
|
||||
<dt><a name="rmdir"></a><strong><code>lfs.rmdir (dirname)</code></strong></dt>
|
||||
<dd>Removes an existing directory. The argument is the name of the directory.<br />
|
||||
Returns <code>true</code> if the operation was successful;
|
||||
in case of error, it returns <code>nil</code> plus an error string.</dd>
|
||||
Returns <code>true</code> in case of success or <code>nil</code>, an error message and
|
||||
a system-dependent error code in case of error.
|
||||
|
||||
<dt><a name="setmode"></a><strong><code>lfs.setmode (file, mode)</code></strong></dt>
|
||||
<dd>Sets the writing mode for a file. The mode string can be either <code>"binary"</code> or <code>"text"</code>.
|
||||
@@ -242,6 +242,8 @@ LuaFileSystem offers the following functions:
|
||||
<dt><a name="symlinkattributes"></a><strong><code>lfs.symlinkattributes (filepath [, aname])</code></strong></dt>
|
||||
<dd>Identical to <a href="#attributes">lfs.attributes</a> except that
|
||||
it obtains information about the link itself (not the file it refers to).
|
||||
It also adds a <strong><code>target</code></strong> field, containing
|
||||
the file name that the symlink points to.
|
||||
On Windows this function does not yet support links, and is identical to
|
||||
<code>lfs.attributes</code>.
|
||||
</dd>
|
||||
@@ -255,8 +257,8 @@ LuaFileSystem offers the following functions:
|
||||
Lua standard function <code>os.time</code>).
|
||||
If the modification time is omitted, the access time provided is used;
|
||||
if both times are omitted, the current time is used.<br />
|
||||
Returns <code>true</code> if the operation was successful;
|
||||
in case of error, it returns <code>nil</code> plus an error string.
|
||||
Returns <code>true</code> in case of success or <code>nil</code>, an error message and
|
||||
a system-dependent error code in case of error.
|
||||
</dd>
|
||||
|
||||
<dt><a name="unlock"></a><strong><code>lfs.unlock (filehandle[, start[, length]])</code></strong></dt>
|
||||
|
||||
28
rockspecs/luafilesystem-1.7.0-1.rockspec
Normal file
28
rockspecs/luafilesystem-1.7.0-1.rockspec
Normal file
@@ -0,0 +1,28 @@
|
||||
package = "LuaFileSystem"
|
||||
version = "1.7.0-1"
|
||||
source = {
|
||||
url = "git://github.com/keplerproject/luafilesystem",
|
||||
tag = "v1_7_0",
|
||||
}
|
||||
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.
|
||||
]],
|
||||
license = "MIT/X11",
|
||||
}
|
||||
dependencies = {
|
||||
"lua >= 5.1"
|
||||
}
|
||||
build = {
|
||||
type = "builtin",
|
||||
modules = {
|
||||
lfs = "src/lfs.c"
|
||||
},
|
||||
copy_directories = {
|
||||
"doc", "tests"
|
||||
}
|
||||
}
|
||||
28
rockspecs/luafilesystem-1.7.0-2.rockspec
Normal file
28
rockspecs/luafilesystem-1.7.0-2.rockspec
Normal file
@@ -0,0 +1,28 @@
|
||||
package = "LuaFileSystem"
|
||||
version = "1.7.0-2"
|
||||
source = {
|
||||
url = "git://github.com/keplerproject/luafilesystem",
|
||||
tag = "v1_7_0_2",
|
||||
}
|
||||
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.
|
||||
]],
|
||||
license = "MIT/X11",
|
||||
}
|
||||
dependencies = {
|
||||
"lua >= 5.1"
|
||||
}
|
||||
build = {
|
||||
type = "builtin",
|
||||
modules = {
|
||||
lfs = "src/lfs.c"
|
||||
},
|
||||
copy_directories = {
|
||||
"doc", "tests"
|
||||
}
|
||||
}
|
||||
265
src/lfs.c
265
src/lfs.c
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
** LuaFileSystem
|
||||
** Copyright Kepler Project 2003 - 2016 (http://keplerproject.github.io/luafilesystem)
|
||||
** Copyright Kepler Project 2003 - 2017 (http://keplerproject.github.io/luafilesystem)
|
||||
**
|
||||
** File system manipulation library.
|
||||
** This library offers these functions:
|
||||
@@ -41,22 +41,26 @@
|
||||
#include <sys/stat.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <direct.h>
|
||||
#include <windows.h>
|
||||
#include <io.h>
|
||||
#include <sys/locking.h>
|
||||
#ifdef __BORLANDC__
|
||||
#include <utime.h>
|
||||
#include <direct.h>
|
||||
#include <windows.h>
|
||||
#include <io.h>
|
||||
#include <sys/locking.h>
|
||||
#ifdef __BORLANDC__
|
||||
#include <utime.h>
|
||||
#else
|
||||
#include <sys/utime.h>
|
||||
#endif
|
||||
#include <fcntl.h>
|
||||
/* MAX_PATH seems to be 260. Seems kind of small. Is there a better one? */
|
||||
#define LFS_MAXPATHLEN MAX_PATH
|
||||
#else
|
||||
#include <sys/utime.h>
|
||||
#endif
|
||||
#include <fcntl.h>
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#include <dirent.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/types.h>
|
||||
#include <utime.h>
|
||||
#include <unistd.h>
|
||||
#include <dirent.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/types.h>
|
||||
#include <utime.h>
|
||||
#include <sys/param.h> /* for MAXPATHLEN */
|
||||
#define LFS_MAXPATHLEN MAXPATHLEN
|
||||
#endif
|
||||
|
||||
#include <lua.h>
|
||||
@@ -65,7 +69,7 @@
|
||||
|
||||
#include "lfs.h"
|
||||
|
||||
#define LFS_VERSION "1.6.3"
|
||||
#define LFS_VERSION "1.7.0"
|
||||
#define LFS_LIBNAME "lfs"
|
||||
|
||||
#if LUA_VERSION_NUM >= 503 /* Lua 5.3 */
|
||||
@@ -76,8 +80,10 @@
|
||||
|
||||
#endif
|
||||
|
||||
#if LUA_VERSION_NUM < 502
|
||||
# define luaL_newlib(L,l) (lua_newtable(L), luaL_register(L,NULL,l))
|
||||
#if LUA_VERSION_NUM >= 502
|
||||
# define new_lib(L, l) (luaL_newlib(L, l))
|
||||
#else
|
||||
# define new_lib(L, l) (lua_newtable(L), luaL_register(L, NULL, l))
|
||||
#endif
|
||||
|
||||
/* Define 'strerror' for systems that do not implement it */
|
||||
@@ -85,22 +91,6 @@
|
||||
#define strerror(_) "System unable to describe the error"
|
||||
#endif
|
||||
|
||||
/* Define 'getcwd' for systems that do not implement it */
|
||||
#ifdef NO_GETCWD
|
||||
#define getcwd(p,s) NULL
|
||||
#define getcwd_error "Function 'getcwd' not provided by system"
|
||||
#else
|
||||
#define getcwd_error strerror(errno)
|
||||
#ifdef _WIN32
|
||||
/* MAX_PATH seems to be 260. Seems kind of small. Is there a better one? */
|
||||
#define LFS_MAXPATHLEN MAX_PATH
|
||||
#else
|
||||
/* For MAXPATHLEN: */
|
||||
#include <sys/param.h>
|
||||
#define LFS_MAXPATHLEN MAXPATHLEN
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define DIR_METATABLE "directory metatable"
|
||||
typedef struct dir_data {
|
||||
int closed;
|
||||
@@ -133,6 +123,13 @@ typedef struct dir_data {
|
||||
#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
|
||||
*/
|
||||
@@ -147,12 +144,13 @@ static int pusherror(lua_State *L, const char *info)
|
||||
return 3;
|
||||
}
|
||||
|
||||
static int pushresult(lua_State *L, int i, const char *info)
|
||||
{
|
||||
if (i==-1)
|
||||
return pusherror(L, info);
|
||||
lua_pushinteger(L, i);
|
||||
return 1;
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -178,18 +176,38 @@ static int change_dir (lua_State *L) {
|
||||
** and a string describing the error
|
||||
*/
|
||||
static int get_dir (lua_State *L) {
|
||||
char *path;
|
||||
/* Passing (NULL, 0) is not guaranteed to work. Use a temp buffer and size instead. */
|
||||
char buf[LFS_MAXPATHLEN];
|
||||
if ((path = getcwd(buf, LFS_MAXPATHLEN)) == NULL) {
|
||||
#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) {
|
||||
char* path2 = realloc(path, size);
|
||||
if (!path2) /* failed to allocate */ {
|
||||
result = pusherror(L, "get_dir realloc() failed");
|
||||
break;
|
||||
}
|
||||
path = path2;
|
||||
if (getcwd(path, size) != NULL) {
|
||||
/* success, push the path to the Lua stack */
|
||||
lua_pushstring(L, path);
|
||||
result = 1;
|
||||
break;
|
||||
}
|
||||
if (errno != ERANGE) { /* unexpected error */
|
||||
result = pusherror(L, "get_dir getcwd() failed");
|
||||
break;
|
||||
}
|
||||
/* ERANGE = insufficient buffer capacity, double size and retry */
|
||||
size *= 2;
|
||||
}
|
||||
free(path);
|
||||
return result;
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -417,16 +435,20 @@ static int file_unlock (lua_State *L) {
|
||||
** @param #2 Name of link.
|
||||
** @param #3 True if link is symbolic (optional).
|
||||
*/
|
||||
static int make_link(lua_State *L)
|
||||
{
|
||||
static int make_link (lua_State *L) {
|
||||
#ifndef _WIN32
|
||||
const char *oldpath = luaL_checkstring(L, 1);
|
||||
const char *newpath = luaL_checkstring(L, 2);
|
||||
return pushresult(L,
|
||||
(lua_toboolean(L,3) ? symlink : link)(oldpath, newpath), NULL);
|
||||
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
|
||||
errno = ENOSYS; /* = "Function not implemented" */
|
||||
return pushresult(L, -1, "make_link is not supported on Windows");
|
||||
errno = ENOSYS; /* = "Function not implemented" */
|
||||
return pushresult(L, -1, "make_link is not supported on Windows");
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -436,21 +458,8 @@ static int make_link(lua_State *L)
|
||||
** @param #1 Directory path.
|
||||
*/
|
||||
static int make_dir (lua_State *L) {
|
||||
const char *path = luaL_checkstring (L, 1);
|
||||
int fail;
|
||||
#ifdef _WIN32
|
||||
fail = _mkdir (path);
|
||||
#else
|
||||
fail = mkdir (path, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP |
|
||||
S_IWGRP | S_IXGRP | S_IROTH | S_IXOTH );
|
||||
#endif
|
||||
if (fail) {
|
||||
lua_pushnil (L);
|
||||
lua_pushfstring (L, "%s", strerror(errno));
|
||||
return 2;
|
||||
}
|
||||
lua_pushboolean (L, 1);
|
||||
return 1;
|
||||
const char *path = luaL_checkstring(L, 1);
|
||||
return pushresult(L, lfs_mkdir(path), NULL);
|
||||
}
|
||||
|
||||
|
||||
@@ -459,18 +468,8 @@ static int make_dir (lua_State *L) {
|
||||
** @param #1 Directory path.
|
||||
*/
|
||||
static int remove_dir (lua_State *L) {
|
||||
const char *path = luaL_checkstring (L, 1);
|
||||
int fail;
|
||||
|
||||
fail = rmdir (path);
|
||||
|
||||
if (fail) {
|
||||
lua_pushnil (L);
|
||||
lua_pushfstring (L, "%s", strerror(errno));
|
||||
return 2;
|
||||
}
|
||||
lua_pushboolean (L, 1);
|
||||
return 1;
|
||||
const char *path = luaL_checkstring(L, 1);
|
||||
return pushresult(L, rmdir(path), NULL);
|
||||
}
|
||||
|
||||
|
||||
@@ -657,26 +656,24 @@ static const char *mode2string (mode_t mode) {
|
||||
|
||||
|
||||
/*
|
||||
** 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;
|
||||
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;
|
||||
}
|
||||
if (utime (file, buf)) {
|
||||
lua_pushnil (L);
|
||||
lua_pushfstring (L, "%s", strerror (errno));
|
||||
return 2;
|
||||
}
|
||||
lua_pushboolean (L, 1);
|
||||
return 1;
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
@@ -813,7 +810,8 @@ static int _file_info_ (lua_State *L, int (*st)(const char*, STAT_STRUCT*)) {
|
||||
if (st(file, &info)) {
|
||||
lua_pushnil(L);
|
||||
lua_pushfstring(L, "cannot obtain information from file '%s': %s", file, strerror(errno));
|
||||
return 2;
|
||||
lua_pushinteger(L, errno);
|
||||
return 3;
|
||||
}
|
||||
if (lua_isstring (L, 2)) {
|
||||
const char *member = lua_tostring (L, 2);
|
||||
@@ -827,7 +825,8 @@ static int _file_info_ (lua_State *L, int (*st)(const char*, STAT_STRUCT*)) {
|
||||
/* member not found */
|
||||
return luaL_error(L, "invalid attribute name '%s'", member);
|
||||
}
|
||||
/* creates a table if none is given */
|
||||
/* creates a table if none is given, removes extra arguments */
|
||||
lua_settop(L, 2);
|
||||
if (!lua_istable (L, 2)) {
|
||||
lua_newtable (L);
|
||||
}
|
||||
@@ -849,11 +848,61 @@ static int file_info (lua_State *L) {
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
** Push the symlink target to the top of the stack.
|
||||
** Assumes the file name is at position 1 of the stack.
|
||||
** Returns 1 if successful (with the target on top of the stack),
|
||||
** 0 on failure (with stack unchanged, and errno set).
|
||||
*/
|
||||
static int push_link_target(lua_State *L) {
|
||||
#ifdef _WIN32
|
||||
errno = ENOSYS;
|
||||
return 0;
|
||||
#else
|
||||
const char *file = luaL_checkstring(L, 1);
|
||||
char *target = NULL;
|
||||
int tsize, size = 256; /* size = initial buffer capacity */
|
||||
while (1) {
|
||||
char* target2 = realloc(target, size);
|
||||
if (!target2) { /* failed to allocate */
|
||||
free(target);
|
||||
return 0;
|
||||
}
|
||||
target = target2;
|
||||
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) {
|
||||
return _file_info_ (L, LSTAT_FUNC);
|
||||
int ret;
|
||||
if (lua_isstring (L, 2) && (strcmp(lua_tostring(L, 2), "target") == 0)) {
|
||||
int ok = push_link_target(L);
|
||||
return ok ? 1 : pusherror(L, "could not obtain link target");
|
||||
}
|
||||
ret = _file_info_ (L, LSTAT_FUNC);
|
||||
if (ret == 1 && lua_type(L, -1) == LUA_TTABLE) {
|
||||
int ok = push_link_target(L);
|
||||
if (ok) {
|
||||
lua_setfield(L, -2, "target");
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@@ -861,7 +910,7 @@ static int link_info (lua_State *L) {
|
||||
** Assumes the table is on top of the stack.
|
||||
*/
|
||||
static void set_info (lua_State *L) {
|
||||
lua_pushliteral(L, "Copyright (C) 2003-2016 Kepler Project");
|
||||
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");
|
||||
@@ -890,7 +939,7 @@ static const struct luaL_Reg fslib[] = {
|
||||
LFS_EXPORT int luaopen_lfs (lua_State *L) {
|
||||
dir_create_meta (L);
|
||||
lock_create_meta (L);
|
||||
luaL_newlib (L, fslib);
|
||||
new_lib (L, fslib);
|
||||
lua_pushvalue(L, -1);
|
||||
lua_setglobal(L, LFS_LIBNAME);
|
||||
set_info (L);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
LIBRARY lfs.dll
|
||||
VERSION 1.6
|
||||
VERSION 1.7
|
||||
EXPORTS
|
||||
luaopen_lfs
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
** LuaFileSystem
|
||||
** Copyright Kepler Project 2003 - 2016 (http://keplerproject.github.io/luafilesystem)
|
||||
** Copyright Kepler Project 2003 - 2017 (http://keplerproject.github.io/luafilesystem)
|
||||
*/
|
||||
|
||||
/* Define 'chdir' for systems that do not implement it */
|
||||
|
||||
@@ -91,6 +91,8 @@ io.flush()
|
||||
if lfs.link (tmpfile, "_a_link_for_test_", true) then
|
||||
assert (lfs.attributes"_a_link_for_test_".mode == "file")
|
||||
assert (lfs.symlinkattributes"_a_link_for_test_".mode == "link")
|
||||
assert (lfs.symlinkattributes"_a_link_for_test_".target == tmpfile)
|
||||
assert (lfs.symlinkattributes("_a_link_for_test_", "target") == tmpfile)
|
||||
assert (lfs.link (tmpfile, "_a_hard_link_for_test_"))
|
||||
assert (lfs.attributes (tmpfile, "nlink") == 2)
|
||||
assert (os.remove"_a_link_for_test_")
|
||||
@@ -130,6 +132,17 @@ for key, value in pairs(attr) do
|
||||
"lfs.attributes values not consistent")
|
||||
end
|
||||
|
||||
-- Check that lfs.attributes accepts a table as second argument
|
||||
local attr2 = {}
|
||||
lfs.attributes(tmpfile, attr2)
|
||||
for key, value in pairs(attr2) do
|
||||
assert (value == lfs.attributes (tmpfile, key),
|
||||
"lfs.attributes values with table argument not consistent")
|
||||
end
|
||||
|
||||
-- Check that extra arguments are ignored
|
||||
lfs.attributes(tmpfile, attr2, nil)
|
||||
|
||||
-- Remove new file and directory
|
||||
assert (os.remove (tmpfile), "could not remove new file")
|
||||
assert (lfs.rmdir (tmpdir), "could not remove new directory")
|
||||
@@ -139,7 +152,10 @@ io.write(".")
|
||||
io.flush()
|
||||
|
||||
-- Trying to get attributes of a non-existent file
|
||||
assert (lfs.attributes ("this couldn't be an actual file") == nil, "could get attributes of a non-existent file")
|
||||
local attr_ok, err, errno = lfs.attributes("this couldn't be an actual file")
|
||||
assert(attr_ok == nil, "could get attributes of a non-existent file")
|
||||
assert(type(err) == "string", "failed lfs.attributes did not return an error message")
|
||||
assert(type(errno) == "number", "failed lfs.attributes did not return error code")
|
||||
assert (type(lfs.attributes (upper)) == "table", "couldn't get attributes of upper directory")
|
||||
|
||||
io.write(".")
|
||||
|
||||
Reference in New Issue
Block a user