TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Defer PHYSFS_tell in PHYSFSX_fgets

Browse source
This commit is contained in:
Kp 2015-10-09 02:46:11 +00:00
parent 1ecbeb6bf9
commit a4826a2f75
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
similar/misc/physfsx.cpp
View file

@ -34,7 +34,6 @@ const array<file_extension_t, 1> archive_exts{{"dxa"}};
char *PHYSFSX_fgets_t::get(char *const buf, std::size_t n, PHYSFS_file *const fp)
{
PHYSFS_sint64 t = PHYSFS_tell(fp);
PHYSFS_sint64 r = PHYSFS_read(fp, buf, sizeof(*buf), n - 1);
if (r <= 0)
return DXX_POISON_MEMORY(buf, buf + n, 0xcc), nullptr;
@ -42,7 +41,8 @@ char *PHYSFSX_fgets_t::get(char *const buf, std::size_t n, PHYSFS_file *const fp
const auto cleanup = [&]{
return *p = 0, DXX_POISON_MEMORY(p + 1, buf + n, 0xcc), p;
};
for (char *e = buf + r;;)
char *const e = &buf[r];
for (;;)
{
if (p == e)
{
@ -64,7 +64,7 @@ char *PHYSFSX_fgets_t::get(char *const buf, std::size_t n, PHYSFS_file *const fp
}
++p;
}
PHYSFS_seek(fp, t + (p - buf) + 1);
PHYSFS_seek(fp, PHYSFS_tell(fp) + p - e + 1);
return cleanup();
}