lihao/luafilesystem
1
0
Fork 0
mirror of https://github.com/lunarmodules/luafilesystem.git synced 2026-07-25 13:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52 from siffiejoe/checkfile

Browse Source 
Fix detection of closed files on Lua 5.2/5.3.
This commit is contained in:
Hisham Muhammad
2015-06-15 17:25:40 -03:00
parent 5f8b6461a2 c315150aff
commit b6d5b37c1b
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/lfs.c
View File

@@ -197,15 +197,23 @@ static int get_dir (lua_State *L) {
** Check if the given element on the stack is a file and returns it. ** 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) { static FILE *check_file (lua_State *L, int idx, const char *funcname) {
#if LUA_VERSION_NUM == 501
FILE **fh = (FILE **)luaL_checkudata (L, idx, "FILE*"); FILE **fh = (FILE **)luaL_checkudata (L, idx, "FILE*");
if (fh == NULL) { if (*fh == NULL) {
luaL_error (L, "%s: not a file", funcname);
return 0;
} else if (*fh == NULL) {
luaL_error (L, "%s: closed file", funcname); luaL_error (L, "%s: closed file", funcname);
return 0; return 0;
} else } else
return *fh; 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
} }