summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.c
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.c')
-rw-r--r--Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.c937
1 files changed, 516 insertions, 421 deletions
diff --git a/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.c b/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.c
index 2b1b06cf1db..c8122c2ca95 100644
--- a/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.c
+++ b/Build/source/texk/web2c/luatexdir/luafilesystem/src/lfs.c
@@ -1,25 +1,25 @@
/*
** LuaFileSystem
-** Copyright Kepler Project 2003 (http://www.keplerproject.org/luafilesystem)
+** Copyright Kepler Project 2003 - 2017 (http://keplerproject.github.io/luafilesystem)
**
** File system manipulation library.
** This library offers these functions:
-** lfs.attributes (filepath [, attributename])
+** lfs.attributes (filepath [, attributename | attributetable])
** lfs.chdir (path)
** lfs.currentdir ()
** lfs.dir (path)
+** lfs.link (old, new[, symlink])
** lfs.lock (fh, mode)
** lfs.lock_dir (path)
** lfs.mkdir (path)
** lfs.rmdir (path)
** lfs.setmode (filepath, mode)
-** lfs.symlinkattributes (filepath [, attributename]) -- thanks to Sam Roberts
+** lfs.symlinkattributes (filepath [, attributename])
** lfs.touch (filepath [, atime [, mtime]])
** lfs.unlock (fh)
-**
-** $Id: lfs.c,v 1.61 2009/07/04 02:10:16 mascarenhas Exp $
*/
+#ifndef LFS_DO_NOT_USE_LARGE_FILE
#ifndef _WIN32
#ifndef _AIX
#define _FILE_OFFSET_BITS 64 /* Linux, Solaris and HP-UX */
@@ -27,8 +27,11 @@
#define _LARGE_FILES 1 /* AIX */
#endif
#endif
+#endif
+#ifndef LFS_DO_NOT_USE_LARGE_FILE
#define _LARGEFILE64_SOURCE
+#endif
#include <errno.h>
#include <stdio.h>
@@ -38,93 +41,133 @@
#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"
-#include "lauxlib.h"
-#include "lualib.h"
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+
#include "lfs.h"
-/* Define 'strerror' for systems that do not implement it */
-#ifdef NO_STRERROR
-#define strerror(_) "System unable to describe the error"
+#define LFS_VERSION "1.7.0"
+#define LFS_LIBNAME "lfs"
+
+#if LUA_VERSION_NUM >= 503 /* Lua 5.3 */
+
+#ifndef luaL_optlong
+#define luaL_optlong luaL_optinteger
#endif
-/* Define 'getcwd' for systems that do not implement it */
-#ifdef NO_GETCWD
-#define getcwd(p,s) NULL
-#define getcwd_error "Function 'getcwd' not provided by system"
+#endif
+
+#if LUA_VERSION_NUM >= 502
+# define new_lib(L, l) (luaL_newlib(L, l))
#else
-#define getcwd_error strerror(errno)
+# define new_lib(L, l) (lua_newtable(L), luaL_register(L, NULL, l))
+#endif
+
+/* Define 'strerror' for systems that do not implement it */
+#ifdef NO_STRERROR
+#define strerror(_) "System unable to describe the error"
#endif
-#define DIR_METATABLE "lfs.directory"
-#define MAX_DIR_LENGTH 1023
+#define DIR_METATABLE "directory metatable"
typedef struct dir_data {
- int closed;
+ int closed;
#ifdef _WIN32
- long hFile;
- char pattern[MAX_DIR_LENGTH+1];
+ intptr_t hFile;
+ char pattern[MAX_PATH+1];
#else
- DIR *dir;
+ DIR *dir;
#endif
} dir_data;
-#define LOCK_METATABLE "lfs.lock"
+#define LOCK_METATABLE "lock metatable"
#ifdef _WIN32
#ifdef __BORLANDC__
- #define lfs_setmode(L,file,m) ((void)L, setmode(_fileno(file), m))
+ #define lfs_setmode(file, m) (setmode(_fileno(file), m))
#define STAT_STRUCT struct stati64
#else
- #define lfs_setmode(L,file,m) ((void)L, _setmode(_fileno(file), m))
+ #define lfs_setmode(file, m) (_setmode(_fileno(file), m))
#define STAT_STRUCT struct _stati64
#endif
#define STAT_FUNC _stati64
+#define LSTAT_FUNC STAT_FUNC
#else
-#ifndef _O_TEXT
- #define _O_TEXT 0
-#endif
-#ifndef _O_BINARY
- #define _O_BINARY 0
-#endif
-#define lfs_setmode(L,file,m) ((void)((void)file,m), \
- luaL_error(L, LUA_QL("setmode") " not supported on this platform"), -1)
+#define _O_TEXT 0
+#define _O_BINARY 0
+#define lfs_setmode(file, m) ((void)file, (void)m, 0)
#define STAT_STRUCT struct stat
#define STAT_FUNC stat
#define LSTAT_FUNC lstat
#endif
+#ifdef _WIN32
+ #define lfs_mkdir _mkdir
+#else
+ #define lfs_mkdir(path) (mkdir((path), \
+ S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IXOTH))
+#endif
+
+/*
+** Utility functions
+*/
+static int pusherror(lua_State *L, const char *info)
+{
+ lua_pushnil(L);
+ if (info==NULL)
+ lua_pushstring(L, strerror(errno));
+ else
+ lua_pushfstring(L, "%s: %s", info, strerror(errno));
+ lua_pushinteger(L, errno);
+ return 3;
+}
+
+static int pushresult(lua_State *L, int res, const char *info) {
+ if (res == -1) {
+ return pusherror(L, info);
+ } else {
+ lua_pushboolean(L, 1);
+ return 1;
+ }
+}
+
+
/*
** This function changes the working (current) directory
*/
static int change_dir (lua_State *L) {
- const char *path = luaL_checkstring(L, 1);
- if (chdir(path)) {
- lua_pushnil (L);
- lua_pushfstring (L,"Unable to change working directory to '%s'\n%s\n",
- path, chdir_error);
- return 2;
- } else {
- lua_pushboolean (L, 1);
- return 1;
- }
+ const char *path = luaL_checkstring(L, 1);
+ if (chdir(path)) {
+ lua_pushnil (L);
+ lua_pushfstring (L,"Unable to change working directory to '%s'\n%s\n",
+ path, chdir_error);
+ return 2;
+ } else {
+ lua_pushboolean (L, 1);
+ return 1;
+ }
}
/*
@@ -132,36 +175,59 @@ static int change_dir (lua_State *L) {
** If unable to get the current directory, it returns nil
** and a string describing the error
*/
-#ifndef PATH_MAX
-#define PATH_MAX 4096
-#endif
-
static int get_dir (lua_State *L) {
- char path[PATH_MAX];
- if (getcwd((char *)path, PATH_MAX) == NULL) {
+#ifdef NO_GETCWD
lua_pushnil(L);
- lua_pushstring(L, getcwd_error);
+ lua_pushstring(L, "Function 'getcwd' not provided by system");
return 2;
- }
- else {
- lua_pushstring(L, path);
- return 1;
- }
+#else
+ char *path = NULL;
+ /* Passing (NULL, 0) is not guaranteed to work. Use a temp buffer and size instead. */
+ size_t size = LFS_MAXPATHLEN; /* initial buffer size */
+ int result;
+ while (1) {
+ path = realloc(path, size);
+ if (!path) /* failed to allocate */
+ return pusherror(L, "get_dir realloc() failed");
+ if (getcwd(path, size) != NULL) {
+ /* success, push the path to the Lua stack */
+ lua_pushstring(L, path);
+ result = 1;
+ break;
+ }
+ if (errno != ERANGE) { /* unexpected error */
+ result = pusherror(L, "get_dir getcwd() failed");
+ break;
+ }
+ /* ERANGE = insufficient buffer capacity, double size and retry */
+ size *= 2;
+ }
+ free(path);
+ return result;
+#endif
}
/*
** Check if the given element on the stack is a file and returns it.
*/
static FILE *check_file (lua_State *L, int idx, const char *funcname) {
- FILE **fh = (FILE **)luaL_checkudata (L, idx, "FILE*");
- if (fh == NULL) {
- luaL_error (L, "%s: not a file", funcname);
- return 0;
- } else if (*fh == NULL) {
- luaL_error (L, "%s: closed file", funcname);
- return 0;
- } else
- return *fh;
+#if LUA_VERSION_NUM == 501
+ FILE **fh = (FILE **)luaL_checkudata (L, idx, "FILE*");
+ if (*fh == NULL) {
+ luaL_error (L, "%s: closed file", funcname);
+ return 0;
+ } else
+ return *fh;
+#elif LUA_VERSION_NUM >= 502 && LUA_VERSION_NUM <= 503
+ luaL_Stream *fh = (luaL_Stream *)luaL_checkudata (L, idx, "FILE*");
+ if (fh->closef == 0 || fh->f == NULL) {
+ luaL_error (L, "%s: closed file", funcname);
+ return 0;
+ } else
+ return fh->f;
+#else
+#error unsupported Lua version
+#endif
}
@@ -169,50 +235,50 @@ static FILE *check_file (lua_State *L, int idx, const char *funcname) {
**
*/
static int _file_lock (lua_State *L, FILE *fh, const char *mode, const long start, long len, const char *funcname) {
- int code;
+ int code;
#ifdef _WIN32
- /* lkmode valid values are:
- LK_LOCK Locks the specified bytes. If the bytes cannot be locked, the program immediately tries again after 1 second. If, after 10 attempts, the bytes cannot be locked, the constant returns an error.
- LK_NBLCK Locks the specified bytes. If the bytes cannot be locked, the constant returns an error.
- LK_NBRLCK Same as _LK_NBLCK.
- LK_RLCK Same as _LK_LOCK.
- LK_UNLCK Unlocks the specified bytes, which must have been previously locked.
-
- Regions should be locked only briefly and should be unlocked before closing a file or exiting the program.
-
- http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_crt__locking.asp
- */
- int lkmode;
- switch (*mode) {
- case 'r': lkmode = LK_NBLCK; break;
- case 'w': lkmode = LK_NBLCK; break;
- case 'u': lkmode = LK_UNLCK; break;
- default : return luaL_error (L, "%s: invalid mode", funcname);
- }
- if (!len) {
- fseek (fh, 0L, SEEK_END);
- len = ftell (fh);
- }
- fseek (fh, start, SEEK_SET);
+ /* lkmode valid values are:
+ LK_LOCK Locks the specified bytes. If the bytes cannot be locked, the program immediately tries again after 1 second. If, after 10 attempts, the bytes cannot be locked, the constant returns an error.
+ LK_NBLCK Locks the specified bytes. If the bytes cannot be locked, the constant returns an error.
+ LK_NBRLCK Same as _LK_NBLCK.
+ LK_RLCK Same as _LK_LOCK.
+ LK_UNLCK Unlocks the specified bytes, which must have been previously locked.
+
+ Regions should be locked only briefly and should be unlocked before closing a file or exiting the program.
+
+ http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_crt__locking.asp
+ */
+ int lkmode;
+ switch (*mode) {
+ case 'r': lkmode = LK_NBLCK; break;
+ case 'w': lkmode = LK_NBLCK; break;
+ case 'u': lkmode = LK_UNLCK; break;
+ default : return luaL_error (L, "%s: invalid mode", funcname);
+ }
+ if (!len) {
+ fseek (fh, 0L, SEEK_END);
+ len = ftell (fh);
+ }
+ fseek (fh, start, SEEK_SET);
#ifdef __BORLANDC__
- code = locking (fileno(fh), lkmode, len);
+ code = locking (fileno(fh), lkmode, len);
#else
- code = _locking (fileno(fh), lkmode, len);
+ code = _locking (fileno(fh), lkmode, len);
#endif
#else
- struct flock f;
- switch (*mode) {
- case 'w': f.l_type = F_WRLCK; break;
- case 'r': f.l_type = F_RDLCK; break;
- case 'u': f.l_type = F_UNLCK; break;
- default : return luaL_error (L, "%s: invalid mode", funcname);
- }
- f.l_whence = SEEK_SET;
- f.l_start = (off_t)start;
- f.l_len = (off_t)len;
- code = fcntl (fileno(fh), F_SETLK, &f);
+ struct flock f;
+ switch (*mode) {
+ case 'w': f.l_type = F_WRLCK; break;
+ case 'r': f.l_type = F_RDLCK; break;
+ case 'u': f.l_type = F_UNLCK; break;
+ default : return luaL_error (L, "%s: invalid mode", funcname);
+ }
+ f.l_whence = SEEK_SET;
+ f.l_start = (off_t)start;
+ f.l_len = (off_t)len;
+ code = fcntl (fileno(fh), F_SETLK, &f);
#endif
- return (code != -1);
+ return (code != -1);
}
#ifdef _WIN32
@@ -226,19 +292,19 @@ static int lfs_lock_dir(lua_State *L) {
const char *lockfile = "/lockfile.lfs";
const char *path = luaL_checklstring(L, 1, &pathl);
ln = (char*)malloc(pathl + strlen(lockfile) + 1);
- if(!ln) {
+ if(!ln) {
lua_pushnil(L); lua_pushstring(L, strerror(errno)); return 2;
}
strcpy(ln, path); strcat(ln, lockfile);
- if((fd = CreateFile(ln, GENERIC_WRITE, 0, NULL, CREATE_NEW,
- FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, NULL)) == INVALID_HANDLE_VALUE) {
- int en = GetLastError();
- free(ln); lua_pushnil(L);
- if(en == ERROR_FILE_EXISTS || en == ERROR_SHARING_VIOLATION)
- lua_pushstring(L, "File exists");
- else
- lua_pushstring(L, strerror(en));
- return 2;
+ if((fd = CreateFile(ln, GENERIC_WRITE, 0, NULL, CREATE_NEW,
+ FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, NULL)) == INVALID_HANDLE_VALUE) {
+ int en = GetLastError();
+ free(ln); lua_pushnil(L);
+ if(en == ERROR_FILE_EXISTS || en == ERROR_SHARING_VIOLATION)
+ lua_pushstring(L, "File exists");
+ else
+ lua_pushstring(L, strerror(en));
+ return 2;
}
free(ln);
lock = (lfs_Lock*)lua_newuserdata(L, sizeof(lfs_Lock));
@@ -248,8 +314,11 @@ static int lfs_lock_dir(lua_State *L) {
return 1;
}
static int lfs_unlock_dir(lua_State *L) {
- lfs_Lock *lock = luaL_checkudata(L, 1, LOCK_METATABLE);
- CloseHandle(lock->fd);
+ lfs_Lock *lock = (lfs_Lock *)luaL_checkudata(L, 1, LOCK_METATABLE);
+ if(lock->fd != INVALID_HANDLE_VALUE) {
+ CloseHandle(lock->fd);
+ lock->fd=INVALID_HANDLE_VALUE;
+ }
return 0;
}
#else
@@ -264,12 +333,12 @@ static int lfs_lock_dir(lua_State *L) {
const char *path = luaL_checklstring(L, 1, &pathl);
lock = (lfs_Lock*)lua_newuserdata(L, sizeof(lfs_Lock));
ln = (char*)malloc(pathl + strlen(lockfile) + 1);
- if(!ln) {
+ if(!ln) {
lua_pushnil(L); lua_pushstring(L, strerror(errno)); return 2;
}
strcpy(ln, path); strcat(ln, lockfile);
if(symlink("lock", ln) == -1) {
- free(ln); lua_pushnil(L);
+ free(ln); lua_pushnil(L);
lua_pushstring(L, strerror(errno)); return 2;
}
lock->ln = ln;
@@ -278,7 +347,7 @@ static int lfs_lock_dir(lua_State *L) {
return 1;
}
static int lfs_unlock_dir(lua_State *L) {
- lfs_Lock *lock = luaL_checkudata(L, 1, LOCK_METATABLE);
+ lfs_Lock *lock = (lfs_Lock *)luaL_checkudata(L, 1, LOCK_METATABLE);
if(lock->ln) {
unlink(lock->ln);
free(lock->ln);
@@ -288,39 +357,26 @@ static int lfs_unlock_dir(lua_State *L) {
}
#endif
-#ifdef _WIN32
static int lfs_g_setmode (lua_State *L, FILE *f, int arg) {
- static const int mode[] = {_O_TEXT, _O_BINARY};
- static const char *const modenames[] = {"text", "binary", NULL};
+ static const int mode[] = {_O_BINARY, _O_TEXT};
+ static const char *const modenames[] = {"binary", "text", NULL};
int op = luaL_checkoption(L, arg, NULL, modenames);
- int res = lfs_setmode(L, f, mode[op]);
+ int res = lfs_setmode(f, mode[op]);
if (res != -1) {
int i;
lua_pushboolean(L, 1);
for (i = 0; modenames[i] != NULL; i++) {
if (mode[i] == res) {
lua_pushstring(L, modenames[i]);
- goto exit;
+ return 2;
}
}
lua_pushnil(L);
- exit:
return 2;
} else {
- int en = errno;
- lua_pushnil(L);
- lua_pushfstring(L, "%s", strerror(en));
- lua_pushinteger(L, en);
- return 3;
+ return pusherror(L, NULL);
}
}
-#else
-static int lfs_g_setmode (lua_State *L, FILE *f, int arg) {
- lua_pushboolean(L, 0);
- lua_pushliteral(L, "setmode not supported on this platform");
- return 2;
-}
-#endif
static int lfs_f_setmode(lua_State *L) {
return lfs_g_setmode(L, check_file(L, 1, "setmode"), 2);
@@ -334,18 +390,18 @@ static int lfs_f_setmode(lua_State *L) {
** @param #4 Number with length (optional).
*/
static int file_lock (lua_State *L) {
- FILE *fh = check_file (L, 1, "lock");
- const char *mode = luaL_checkstring (L, 2);
- const long start = luaL_optlong (L, 3, 0);
- long len = luaL_optlong (L, 4, 0);
- if (_file_lock (L, fh, mode, start, len, "lock")) {
- lua_pushboolean (L, 1);
- return 1;
- } else {
- lua_pushnil (L);
- lua_pushfstring (L, "%s", strerror(errno));
- return 2;
- }
+ FILE *fh = check_file (L, 1, "lock");
+ const char *mode = luaL_checkstring (L, 2);
+ const long start = (long) luaL_optinteger (L, 3, 0);
+ long len = (long) luaL_optinteger (L, 4, 0);
+ if (_file_lock (L, fh, mode, start, len, "lock")) {
+ lua_pushboolean (L, 1);
+ return 1;
+ } else {
+ lua_pushnil (L);
+ lua_pushfstring (L, "%s", strerror(errno));
+ return 2;
+ }
}
@@ -356,99 +412,107 @@ static int file_lock (lua_State *L) {
** @param #3 Number with length (optional).
*/
static int file_unlock (lua_State *L) {
- FILE *fh = check_file (L, 1, "unlock");
- const long start = luaL_optlong (L, 2, 0);
- long len = luaL_optlong (L, 3, 0);
- if (_file_lock (L, fh, "u", start, len, "unlock")) {
- lua_pushboolean (L, 1);
- return 1;
- } else {
- lua_pushnil (L);
- lua_pushfstring (L, "%s", strerror(errno));
- return 2;
- }
+ FILE *fh = check_file (L, 1, "unlock");
+ const long start = (long) luaL_optinteger (L, 2, 0);
+ long len = (long) luaL_optinteger (L, 3, 0);
+ if (_file_lock (L, fh, "u", start, len, "unlock")) {
+ lua_pushboolean (L, 1);
+ return 1;
+ } else {
+ lua_pushnil (L);
+ lua_pushfstring (L, "%s", strerror(errno));
+ return 2;
+ }
}
-static int make_dir (lua_State *L) {
- const char *path = luaL_checkstring (L, 1);
- int fail;
-#ifdef _WIN32
- fail = _mkdir (path);
+/*
+** Creates a link.
+** @param #1 Object to link to.
+** @param #2 Name of link.
+** @param #3 True if link is symbolic (optional).
+*/
+static int make_link (lua_State *L) {
+#ifndef _WIN32
+ const char *oldpath = luaL_checkstring(L, 1);
+ const char *newpath = luaL_checkstring(L, 2);
+ int res = (lua_toboolean(L,3) ? symlink : link)(oldpath, newpath);
+ if (res == -1) {
+ return pusherror(L, NULL);
+ } else {
+ lua_pushinteger(L, 0);
+ return 1;
+ }
#else
- fail = mkdir (path, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP |
- S_IWGRP | S_IXGRP | S_IROTH | S_IXOTH );
+ errno = ENOSYS; /* = "Function not implemented" */
+ return pushresult(L, -1, "make_link is not supported on Windows");
#endif
- if (fail) {
- lua_pushnil (L);
- lua_pushfstring (L, "%s", strerror(errno));
- return 2;
- }
- lua_pushboolean (L, 1);
- return 1;
}
+
/*
-** Removes a directory.
+** Creates a directory.
** @param #1 Directory path.
*/
-static int remove_dir (lua_State *L) {
- const char *path = luaL_checkstring (L, 1);
- int fail;
+static int make_dir (lua_State *L) {
+ const char *path = luaL_checkstring(L, 1);
+ return pushresult(L, lfs_mkdir(path), NULL);
+}
- fail = rmdir (path);
- if (fail) {
- lua_pushnil (L);
- lua_pushfstring (L, "%s", strerror(errno));
- return 2;
- }
- lua_pushboolean (L, 1);
- return 1;
+/*
+** Removes a directory.
+** @param #1 Directory path.
+*/
+static int remove_dir (lua_State *L) {
+ const char *path = luaL_checkstring(L, 1);
+ return pushresult(L, rmdir(path), NULL);
}
+
/*
** Directory iterator
*/
static int dir_iter (lua_State *L) {
#ifdef _WIN32
- struct _finddata_t c_file;
+ struct _finddata_t c_file;
#else
- struct dirent *entry;
+ struct dirent *entry;
#endif
- dir_data *d = (dir_data *)luaL_checkudata (L, 1, DIR_METATABLE);
- luaL_argcheck (L, !d->closed, 1, "closed directory");
+ dir_data *d = (dir_data *)luaL_checkudata (L, 1, DIR_METATABLE);
+ luaL_argcheck (L, d->closed == 0, 1, "closed directory");
#ifdef _WIN32
- if (d->hFile == 0L) { /* first entry */
- if ((d->hFile = _findfirst (d->pattern, &c_file)) == -1L) {
- lua_pushnil (L);
- lua_pushstring (L, strerror (errno));
- return 2;
- } else {
- lua_pushstring (L, c_file.name);
- return 1;
- }
- } else { /* next entry */
- if (_findnext (d->hFile, &c_file) == -1L) {
- /* no more entries => close directory */
- _findclose (d->hFile);
- d->closed = 1;
- return 0;
- } else {
- lua_pushstring (L, c_file.name);
- return 1;
- }
- }
+ if (d->hFile == 0L) { /* first entry */
+ if ((d->hFile = _findfirst (d->pattern, &c_file)) == -1L) {
+ lua_pushnil (L);
+ lua_pushstring (L, strerror (errno));
+ d->closed = 1;
+ return 2;
+ } else {
+ lua_pushstring (L, c_file.name);
+ return 1;
+ }
+ } else { /* next entry */
+ if (_findnext (d->hFile, &c_file) == -1L) {
+ /* no more entries => close directory */
+ _findclose (d->hFile);
+ d->closed = 1;
+ return 0;
+ } else {
+ lua_pushstring (L, c_file.name);
+ return 1;
+ }
+ }
#else
- if ((entry = readdir (d->dir)) != NULL) {
- lua_pushstring (L, entry->d_name);
- return 1;
- } else {
- /* no more entries => close directory */
- closedir (d->dir);
- d->closed = 1;
- return 0;
- }
+ if ((entry = readdir (d->dir)) != NULL) {
+ lua_pushstring (L, entry->d_name);
+ return 1;
+ } else {
+ /* no more entries => close directory */
+ closedir (d->dir);
+ d->closed = 1;
+ return 0;
+ }
#endif
}
@@ -457,19 +521,18 @@ static int dir_iter (lua_State *L) {
** Closes directory iterators
*/
static int dir_close (lua_State *L) {
- dir_data *d = (dir_data *)lua_touserdata (L, 1);
+ dir_data *d = (dir_data *)lua_touserdata (L, 1);
#ifdef _WIN32
- if (!d->closed && d->hFile) {
- _findclose (d->hFile);
- d->closed = 1;
- }
+ if (!d->closed && d->hFile) {
+ _findclose (d->hFile);
+ }
#else
- if (!d->closed && d->dir) {
- closedir (d->dir);
- d->closed = 1;
- }
+ if (!d->closed && d->dir) {
+ closedir (d->dir);
+ }
#endif
- return 0;
+ d->closed = 1;
+ return 0;
}
@@ -477,27 +540,25 @@ static int dir_close (lua_State *L) {
** Factory of directory iterators
*/
static int dir_iter_factory (lua_State *L) {
- const char *path = luaL_checkstring (L, 1);
- dir_data *d;
- lua_pushcfunction (L, dir_iter);
- d = (dir_data *) lua_newuserdata (L, sizeof(dir_data));
- d->closed = 0;
+ const char *path = luaL_checkstring (L, 1);
+ dir_data *d;
+ lua_pushcfunction (L, dir_iter);
+ d = (dir_data *) lua_newuserdata (L, sizeof(dir_data));
+ luaL_getmetatable (L, DIR_METATABLE);
+ lua_setmetatable (L, -2);
+ d->closed = 0;
#ifdef _WIN32
- d->hFile = 0L;
- luaL_getmetatable (L, DIR_METATABLE);
- lua_setmetatable (L, -2);
- if (strlen(path) > MAX_DIR_LENGTH)
- luaL_error (L, "path too long: %s", path);
- else
- sprintf (d->pattern, "%s/*", path);
+ d->hFile = 0L;
+ if (strlen(path) > MAX_PATH-2)
+ luaL_error (L, "path too long: %s", path);
+ else
+ sprintf (d->pattern, "%s/*", path);
#else
- luaL_getmetatable (L, DIR_METATABLE);
- lua_setmetatable (L, -2);
- d->dir = opendir (path);
- if (d->dir == NULL)
- luaL_error (L, "cannot open %s: %s", path, strerror (errno));
+ d->dir = opendir (path);
+ if (d->dir == NULL)
+ luaL_error (L, "cannot open %s: %s", path, strerror (errno));
#endif
- return 2;
+ return 2;
}
@@ -505,36 +566,39 @@ static int dir_iter_factory (lua_State *L) {
** Creates directory metatable.
*/
static int dir_create_meta (lua_State *L) {
- luaL_newmetatable (L, DIR_METATABLE);
- /* set its __gc field */
- lua_pushstring (L, "__index");
- lua_newtable(L);
- lua_pushstring (L, "next");
- lua_pushcfunction (L, dir_iter);
- lua_settable(L, -3);
- lua_pushstring (L, "close");
- lua_pushcfunction (L, dir_close);
- lua_settable(L, -3);
- lua_settable (L, -3);
- lua_pushstring (L, "__gc");
- lua_pushcfunction (L, dir_close);
- lua_settable (L, -3);
- return 1;
+ luaL_newmetatable (L, DIR_METATABLE);
+
+ /* Method table */
+ lua_newtable(L);
+ lua_pushcfunction (L, dir_iter);
+ lua_setfield(L, -2, "next");
+ lua_pushcfunction (L, dir_close);
+ lua_setfield(L, -2, "close");
+
+ /* Metamethods */
+ lua_setfield(L, -2, "__index");
+ lua_pushcfunction (L, dir_close);
+ lua_setfield (L, -2, "__gc");
+ return 1;
}
+
/*
** Creates lock metatable.
*/
static int lock_create_meta (lua_State *L) {
- luaL_newmetatable (L, LOCK_METATABLE);
- /* set its __gc field */
- lua_newtable(L);
- lua_pushcfunction(L, lfs_unlock_dir);
- lua_setfield(L, -2, "free");
- lua_setfield(L, -2, "__index");
- lua_pushcfunction(L, lfs_unlock_dir);
- lua_setfield(L, -2, "__gc");
- return 1;
+ luaL_newmetatable (L, LOCK_METATABLE);
+
+ /* Method table */
+ lua_newtable(L);
+ lua_pushcfunction(L, lfs_unlock_dir);
+ lua_setfield(L, -2, "free");
+
+ /* Metamethods */
+ lua_setfield(L, -2, "__index");
+ lua_pushcfunction(L, lfs_unlock_dir);
+ lua_setfield(L, -2, "__gc");
+ return 1;
}
@@ -574,104 +638,96 @@ static const char *mode2string (mode_t mode) {
else if ( S_ISDIR(mode) )
return "directory";
else if ( S_ISLNK(mode) )
- return "link";
+ return "link";
else if ( S_ISSOCK(mode) )
return "socket";
else if ( S_ISFIFO(mode) )
- return "named pipe";
+ return "named pipe";
else if ( S_ISCHR(mode) )
- return "char device";
+ return "char device";
else if ( S_ISBLK(mode) )
- return "block device";
+ return "block device";
else
- return "other";
+ return "other";
}
/*
-** Set access time and modification values for file
+** Set access time and modification values for a file.
+** @param #1 File path.
+** @param #2 Access time in seconds, current time is used if missing.
+** @param #3 Modification time in seconds, access time is used if missing.
*/
static int file_utime (lua_State *L) {
- const char *file = luaL_checkstring (L, 1);
- struct utimbuf utb, *buf;
-
- if (lua_gettop (L) == 1) /* set to current date/time */
- buf = NULL;
- else {
- utb.actime = (time_t)luaL_optnumber (L, 2, 0);
- utb.modtime = (time_t)luaL_optnumber (L, 3, utb.actime);
- buf = &utb;
- }
- if (utime (file, buf)) {
- lua_pushnil (L);
- lua_pushfstring (L, "%s", strerror (errno));
- return 2;
- }
- lua_pushboolean (L, 1);
- return 1;
+ const char *file = luaL_checkstring(L, 1);
+ struct utimbuf utb, *buf;
+
+ if (lua_gettop (L) == 1) /* set to current date/time */
+ buf = NULL;
+ else {
+ utb.actime = (time_t) luaL_optnumber(L, 2, 0);
+ utb.modtime = (time_t) luaL_optinteger(L, 3, utb.actime);
+ buf = &utb;
+ }
+
+ return pushresult(L, utime(file, buf), NULL);
}
/* inode protection mode */
static void push_st_mode (lua_State *L, STAT_STRUCT *info) {
- lua_pushstring (L, mode2string (info->st_mode));
+ lua_pushstring (L, mode2string (info->st_mode));
}
/* device inode resides on */
static void push_st_dev (lua_State *L, STAT_STRUCT *info) {
- lua_pushnumber (L, (lua_Number)info->st_dev);
+ lua_pushinteger (L, (lua_Integer) info->st_dev);
}
/* inode's number */
static void push_st_ino (lua_State *L, STAT_STRUCT *info) {
- lua_pushnumber (L, (lua_Number)info->st_ino);
+ lua_pushinteger (L, (lua_Integer) info->st_ino);
}
/* number of hard links to the file */
static void push_st_nlink (lua_State *L, STAT_STRUCT *info) {
- lua_pushnumber (L, (lua_Number)info->st_nlink);
+ lua_pushinteger (L, (lua_Integer)info->st_nlink);
}
/* user-id of owner */
static void push_st_uid (lua_State *L, STAT_STRUCT *info) {
- lua_pushnumber (L, (lua_Number)info->st_uid);
+ lua_pushinteger (L, (lua_Integer)info->st_uid);
}
/* group-id of owner */
static void push_st_gid (lua_State *L, STAT_STRUCT *info) {
- lua_pushnumber (L, (lua_Number)info->st_gid);
+ lua_pushinteger (L, (lua_Integer)info->st_gid);
}
/* device type, for special file inode */
static void push_st_rdev (lua_State *L, STAT_STRUCT *info) {
- lua_pushnumber (L, (lua_Number)info->st_rdev);
+ lua_pushinteger (L, (lua_Integer) info->st_rdev);
}
/* time of last access */
static void push_st_atime (lua_State *L, STAT_STRUCT *info) {
- lua_pushnumber (L, info->st_atime);
+ lua_pushinteger (L, (lua_Integer) info->st_atime);
}
/* time of last data modification */
static void push_st_mtime (lua_State *L, STAT_STRUCT *info) {
- lua_pushnumber (L, info->st_mtime);
+ lua_pushinteger (L, (lua_Integer) info->st_mtime);
}
/* time of last file status change */
static void push_st_ctime (lua_State *L, STAT_STRUCT *info) {
- lua_pushnumber (L, info->st_ctime);
+ lua_pushinteger (L, (lua_Integer) info->st_ctime);
}
/* file size, in bytes */
static void push_st_size (lua_State *L, STAT_STRUCT *info) {
- lua_pushnumber (L, (lua_Number)info->st_size);
+ lua_pushinteger (L, (lua_Integer)info->st_size);
}
#ifndef _WIN32
/* blocks allocated for file */
static void push_st_blocks (lua_State *L, STAT_STRUCT *info) {
- lua_pushnumber (L, (lua_Number)info->st_blocks);
+ lua_pushinteger (L, (lua_Integer)info->st_blocks);
}
/* optimal file system I/O blocksize */
static void push_st_blksize (lua_State *L, STAT_STRUCT *info) {
- lua_pushnumber (L, (lua_Number)info->st_blksize);
+ lua_pushinteger (L, (lua_Integer)info->st_blksize);
}
#endif
-static void push_invalid (lua_State *L, STAT_STRUCT *info) {
- luaL_error(L, "invalid attribute name");
-#ifndef _WIN32
- info->st_blksize = 0; /* never reached */
-#endif
-}
/*
** Convert the inode protection mode to a permission list.
@@ -679,20 +735,20 @@ static void push_invalid (lua_State *L, STAT_STRUCT *info) {
#ifdef _WIN32
static const char *perm2string (unsigned short mode) {
- static char perms[10] = "---------\0";
+ static char perms[10] = "---------";
int i;
- for (i=0;i<9;i++) perms[i]='-';
- if (mode & _S_IREAD)
+ for (i=0;i<9;i++) perms[i]='-';
+ if (mode & _S_IREAD)
{ perms[0] = 'r'; perms[3] = 'r'; perms[6] = 'r'; }
- if (mode & _S_IWRITE)
+ if (mode & _S_IWRITE)
{ perms[1] = 'w'; perms[4] = 'w'; perms[7] = 'w'; }
- if (mode & _S_IEXEC)
+ if (mode & _S_IEXEC)
{ perms[2] = 'x'; perms[5] = 'x'; perms[8] = 'x'; }
return perms;
}
#else
static const char *perm2string (mode_t mode) {
- static char perms[10] = "---------\0";
+ static char perms[10] = "---------";
int i;
for (i=0;i<9;i++) perms[i]='-';
if (mode & S_IRUSR) perms[0] = 'r';
@@ -716,68 +772,68 @@ static void push_st_perm (lua_State *L, STAT_STRUCT *info) {
typedef void (*_push_function) (lua_State *L, STAT_STRUCT *info);
struct _stat_members {
- const char *name;
- _push_function push;
+ const char *name;
+ _push_function push;
};
struct _stat_members members[] = {
- { "mode", push_st_mode },
- { "dev", push_st_dev },
- { "ino", push_st_ino },
- { "nlink", push_st_nlink },
- { "uid", push_st_uid },
- { "gid", push_st_gid },
- { "rdev", push_st_rdev },
- { "access", push_st_atime },
- { "modification", push_st_mtime },
- { "change", push_st_ctime },
- { "size", push_st_size },
- { "permissions", push_st_perm },
+ { "mode", push_st_mode },
+ { "dev", push_st_dev },
+ { "ino", push_st_ino },
+ { "nlink", push_st_nlink },
+ { "uid", push_st_uid },
+ { "gid", push_st_gid },
+ { "rdev", push_st_rdev },
+ { "access", push_st_atime },
+ { "modification", push_st_mtime },
+ { "change", push_st_ctime },
+ { "size", push_st_size },
+ { "permissions", push_st_perm },
#ifndef _WIN32
- { "blocks", push_st_blocks },
- { "blksize", push_st_blksize },
+ { "blocks", push_st_blocks },
+ { "blksize", push_st_blksize },
#endif
- { NULL, push_invalid }
+ { NULL, NULL }
};
/*
** Get file or symbolic link information
*/
static int _file_info_ (lua_State *L, int (*st)(const char*, STAT_STRUCT*)) {
- int i;
- STAT_STRUCT info;
- const char *file = luaL_checkstring (L, 1);
-
- if (st(file, &info)) {
- lua_pushnil (L);
- lua_pushfstring (L, "cannot obtain information from file `%s'", file);
- return 2;
- }
- if (lua_isstring (L, 2)) {
- int v;
- const char *member = lua_tostring (L, 2);
- if (strcmp (member, "mode") == 0) v = 0;
-#ifndef _WIN32
- else if (strcmp (member, "blocks") == 0) v = 11;
- else if (strcmp (member, "blksize") == 0) v = 12;
-#endif
- else /* look for member */
- for (v = 1; members[v].name; v++)
- if (*members[v].name == *member)
- break;
- /* push member value and return */
- members[v].push (L, &info);
- return 1;
- } else if (!lua_istable (L, 2))
- /* creates a table if none is given */
- lua_newtable (L);
- /* stores all members in table on top of the stack */
- for (i = 0; members[i].name; i++) {
- lua_pushstring (L, members[i].name);
- members[i].push (L, &info);
- lua_rawset (L, -3);
- }
- return 1;
+ STAT_STRUCT info;
+ const char *file = luaL_checkstring (L, 1);
+ int i;
+
+ if (st(file, &info)) {
+ lua_pushnil(L);
+ lua_pushfstring(L, "cannot obtain information from file '%s': %s", file, strerror(errno));
+ lua_pushinteger(L, errno);
+ return 3;
+ }
+ if (lua_isstring (L, 2)) {
+ const char *member = lua_tostring (L, 2);
+ for (i = 0; members[i].name; i++) {
+ if (strcmp(members[i].name, member) == 0) {
+ /* push member value and return */
+ members[i].push (L, &info);
+ return 1;
+ }
+ }
+ /* member not found */
+ return luaL_error(L, "invalid attribute name '%s'", member);
+ }
+ /* creates a table if none is given, removes extra arguments */
+ lua_settop(L, 2);
+ if (!lua_istable (L, 2)) {
+ lua_newtable (L);
+ }
+ /* stores all members in table on top of the stack */
+ for (i = 0; members[i].name; i++) {
+ lua_pushstring (L, members[i].name);
+ members[i].push (L, &info);
+ lua_rawset (L, -3);
+ }
+ return 1;
}
@@ -785,62 +841,101 @@ static int _file_info_ (lua_State *L, int (*st)(const char*, STAT_STRUCT*)) {
** Get file information using stat.
*/
static int file_info (lua_State *L) {
- return _file_info_ (L, STAT_FUNC);
+ return _file_info_ (L, STAT_FUNC);
}
/*
-** Get symbolic link information using lstat.
+** Push the symlink target to the top of the stack.
+** Assumes the file name is at position 1 of the stack.
+** Returns 1 if successful (with the target on top of the stack),
+** 0 on failure (with stack unchanged, and errno set).
*/
-#ifndef _WIN32
-static int link_info (lua_State *L) {
- return _file_info_ (L, LSTAT_FUNC);
-}
+static int push_link_target(lua_State *L) {
+#ifdef _WIN32
+ errno = ENOSYS;
+ return 0;
#else
+ const char *file = luaL_checkstring(L, 1);
+ char *target = NULL;
+ int tsize, size = 256; /* size = initial buffer capacity */
+ while (1) {
+ target = realloc(target, size);
+ if (!target) /* failed to allocate */
+ return 0;
+ tsize = readlink(file, target, size);
+ if (tsize < 0) { /* a readlink() error occurred */
+ free(target);
+ return 0;
+ }
+ if (tsize < size)
+ break;
+ /* possibly truncated readlink() result, double size and retry */
+ size *= 2;
+ }
+ target[tsize] = '\0';
+ lua_pushlstring(L, target, tsize);
+ free(target);
+ return 1;
+#endif
+}
+
+/*
+** Get symbolic link information using lstat.
+*/
static int link_info (lua_State *L) {
- lua_pushboolean(L, 0);
- lua_pushliteral(L, "symlinkattributes not supported on this platform");
- return 2;
+ int ret;
+ if (lua_isstring (L, 2) && (strcmp(lua_tostring(L, 2), "target") == 0)) {
+ int ok = push_link_target(L);
+ return ok ? 1 : pusherror(L, "could not obtain link target");
+ }
+ ret = _file_info_ (L, LSTAT_FUNC);
+ if (ret == 1 && lua_type(L, -1) == LUA_TTABLE) {
+ int ok = push_link_target(L);
+ if (ok) {
+ lua_setfield(L, -2, "target");
+ }
+ }
+ return ret;
}
-#endif
/*
** Assumes the table is on top of the stack.
*/
static void set_info (lua_State *L) {
- lua_pushliteral (L, "_COPYRIGHT");
- lua_pushliteral (L, "Copyright (C) 2003-2009 Kepler Project");
- lua_settable (L, -3);
- lua_pushliteral (L, "_DESCRIPTION");
- lua_pushliteral (L, "LuaFileSystem is a Lua library developed to complement the set of functions related to file systems offered by the standard Lua distribution");
- lua_settable (L, -3);
- lua_pushliteral (L, "_VERSION");
- lua_pushliteral (L, "LuaFileSystem 1.5.0");
- lua_settable (L, -3);
+ lua_pushliteral(L, "Copyright (C) 2003-2017 Kepler Project");
+ lua_setfield(L, -2, "_COPYRIGHT");
+ lua_pushliteral(L, "LuaFileSystem is a Lua library developed to complement the set of functions related to file systems offered by the standard Lua distribution");
+ lua_setfield(L, -2, "_DESCRIPTION");
+ lua_pushliteral(L, "LuaFileSystem " LFS_VERSION);
+ lua_setfield(L, -2, "_VERSION");
}
static const struct luaL_Reg fslib[] = {
- {"attributes", file_info},
- {"chdir", change_dir},
- {"currentdir", get_dir},
- {"dir", dir_iter_factory},
- {"lock", file_lock},
- {"mkdir", make_dir},
- {"rmdir", remove_dir},
- {"symlinkattributes", link_info},
- {"setmode", lfs_f_setmode},
- {"touch", file_utime},
- {"unlock", file_unlock},
- {"lock_dir", lfs_lock_dir},
- {NULL, NULL},
+ {"attributes", file_info},
+ {"chdir", change_dir},
+ {"currentdir", get_dir},
+ {"dir", dir_iter_factory},
+ {"link", make_link},
+ {"lock", file_lock},
+ {"mkdir", make_dir},
+ {"rmdir", remove_dir},
+ {"symlinkattributes", link_info},
+ {"setmode", lfs_f_setmode},
+ {"touch", file_utime},
+ {"unlock", file_unlock},
+ {"lock_dir", lfs_lock_dir},
+ {NULL, NULL},
};
-int luaopen_lfs (lua_State *L) {
- dir_create_meta (L);
- lock_create_meta (L);
- luaL_register (L, "lfs", fslib);
- set_info (L);
- return 1;
+LFS_EXPORT int luaopen_lfs (lua_State *L) {
+ dir_create_meta (L);
+ lock_create_meta (L);
+ new_lib (L, fslib);
+ lua_pushvalue(L, -1);
+ lua_setglobal(L, LFS_LIBNAME);
+ set_info (L);
+ return 1;
}