From 7fae11cdb5a129ce798df462365b7ce60c5f4d62 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Thu, 9 Jun 2016 13:28:56 +0300 Subject: Add a test for #52. --- tests/test.lua | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tests') diff --git a/tests/test.lua b/tests/test.lua index abfbd4d..2842bc0 100644 --- a/tests/test.lua +++ b/tests/test.lua @@ -107,6 +107,9 @@ assert(result) -- on non-Windows platforms, mode is always returned as "binary" result, mode = lfs.setmode(f, "text") assert(result and mode == "binary") f:close() +local ok, err = pcall(lfs.setmode, f, "binary") +assert(not ok, "could setmode on closed file") +assert(err:find("closed file"), "bad error message for setmode on closed file") io.write(".") io.flush() -- cgit v1.2.3-55-g6feb From 32b355a9902e6ce7aae68926fc3f2d05856fc299 Mon Sep 17 00:00:00 2001 From: NiteHawk Date: Sat, 16 Jul 2016 15:35:27 +0200 Subject: Add a 'target' field for symlinkattributes. It returns the resolved path of the symlink. Original version by Hisham , modified to use a different strategy for sizing the readlink() buffer. --- doc/us/manual.html | 2 ++ src/lfs.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- tests/test.lua | 2 ++ 3 files changed, 52 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/doc/us/manual.html b/doc/us/manual.html index f5fbaf6..0ecb625 100644 --- a/doc/us/manual.html +++ b/doc/us/manual.html @@ -242,6 +242,8 @@ LuaFileSystem offers the following functions:
lfs.symlinkattributes (filepath [, aname])
Identical to lfs.attributes except that it obtains information about the link itself (not the file it refers to). + It also adds a target field, containing + the file name that the symlink points to. On Windows this function does not yet support links, and is identical to lfs.attributes.
diff --git a/src/lfs.c b/src/lfs.c index 446373c..93c1419 100644 --- a/src/lfs.c +++ b/src/lfs.c @@ -849,11 +849,58 @@ 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) { + 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) { - 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; } diff --git a/tests/test.lua b/tests/test.lua index 2842bc0..2331eec 100644 --- a/tests/test.lua +++ b/tests/test.lua @@ -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_") -- cgit v1.2.3-55-g6feb From 50919ed69ff64df51d8d586d00834fde3e901785 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Thu, 25 Aug 2016 18:24:57 +0300 Subject: Fix lfs.attributes and lfs.symlinkattributes extra argument handling When the second argument is not a string, _file_info() wants to ensure that there is a table on top of the stack: the second argument or a new table. If a new table is pushed it's created on top immediately, but if a table is passed as the second argument it can be followed by extra arguments, with the last one ending up being used as a table, causing a crash. The fix is to remove any potential extra arguments using `lua_settop(L, 2)`. Also added a few tests for this case. Ref #80. --- src/lfs.c | 3 ++- tests/test.lua | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/src/lfs.c b/src/lfs.c index 93c1419..8154a46 100644 --- a/src/lfs.c +++ b/src/lfs.c @@ -827,7 +827,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); } diff --git a/tests/test.lua b/tests/test.lua index 2331eec..10810fe 100644 --- a/tests/test.lua +++ b/tests/test.lua @@ -132,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") -- cgit v1.2.3-55-g6feb