LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-20 20:49:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix looping in File:lines on opened files (resolves #1377)

Browse Source
This commit is contained in:
Bart van Strien
2018-02-11 12:10:57 +01:00
parent fc9fcd2626
commit d60849a9d5
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/filesystem/wrap_File.cpp
+9 -2
View File
@@ -267,6 +267,8 @@ int w_File_lines_i(lua_State *L)
const char *start = buffer+offset; const char *start = buffer+offset;
const char *end = reinterpret_cast<const char*>(memchr(start, '\n', len-offset)); const char *end = reinterpret_cast<const char*>(memchr(start, '\n', len-offset));
bool seekBack = luax_toboolean(L, lua_upvalueindex(5));
// If there are no more lines in the buffer, keep adding more data until we // If there are no more lines in the buffer, keep adding more data until we
// found another line or EOF // found another line or EOF
if (!end && !file->isEOF()) if (!end && !file->isEOF())
@@ -282,7 +284,7 @@ int w_File_lines_i(lua_State *L)
// If the user has changed the position, we need to seek back first // If the user has changed the position, we need to seek back first
int64 pos = file->tell(); int64 pos = file->tell();
int64 userpos = -1; int64 userpos = -1;
if (luax_toboolean(L, lua_upvalueindex(5))) if (seekBack)
{ {
userpos = pos; userpos = pos;
pos = (int64) lua_tonumber(L, lua_upvalueindex(4)); pos = (int64) lua_tonumber(L, lua_upvalueindex(4));
@@ -305,8 +307,13 @@ int w_File_lines_i(lua_State *L)
} }
// Possibly seek back to the user position // Possibly seek back to the user position
if (userpos >= 0 && luax_toboolean(L, lua_upvalueindex(5))) // But make sure to save our target position too
if (seekBack)
{
lua_pushnumber(L, file->tell());
lua_replace(L, lua_upvalueindex(4));
file->seek(userpos); file->seek(userpos);
}
// We've now got a new buffer, replace the old one // We've now got a new buffer, replace the old one
luaL_pushresult(&storage); luaL_pushresult(&storage);