Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

VFS: Do not traumatize Nextra

Browse Source
This commit is contained in:
Arkshine 2015-03-23 18:30:22 +01:00
parent ba11085ddc
commit 8f6b8588c1
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
amxmodx/CFileSystem.h
View File

@ -79,14 +79,14 @@ class ValveFile : public FileObject
static bool Delete(const char* filename, const char* pathID) static bool Delete(const char* filename, const char* pathID)
{ {
if (!g_FileSystem->FileExists(filename)) if (!Exists(filename))
{ {
return false; return false;
} }
g_FileSystem->RemoveFile(filename, pathID); g_FileSystem->RemoveFile(filename, pathID);
if (g_FileSystem->FileExists(filename)) if (Exists(filename))
{ {
return false; return false;
} }

22
amxmodx/file.cpp
View File

@ -37,9 +37,9 @@ static cell AMX_NATIVE_CALL read_dir(AMX *amx, cell *params)
} }
const char* entry = dir->GetEntryName(); const char* entry = dir->GetEntryName();
cell* outputLen = get_amxaddr(amx, params[5]);
size_t entrylen = set_amxstring_utf8(amx, params[3], entry, strlen(entry), params[4] + 1); *outputLen = set_amxstring_utf8(amx, params[3], entry, strlen(entry), params[4] + 1);
*get_amxaddr(amx, params[5]) = entrylen;
return offset; return offset;
} }
@ -79,8 +79,8 @@ static cell AMX_NATIVE_CALL read_file(AMX *amx, cell *params)
if (buffer[length - 1] == '\r') if (buffer[length - 1] == '\r')
buffer[--length] = '\0'; buffer[--length] = '\0';
length = set_amxstring_utf8(amx, params[3], buffer, length, params[4] + 1); // + EOS cell* textLen = get_amxaddr(amx, params[5]);
*get_amxaddr(amx, params[5]) = length; *textLen = set_amxstring_utf8(amx, params[3], buffer, length, params[4] + 1); // + EOS
return currentLine; return currentLine;
} }
@ -761,7 +761,7 @@ static cell AMX_NATIVE_CALL amx_open_dir(AMX *amx, cell *params)
size_t numParams = *params / sizeof(cell); size_t numParams = *params / sizeof(cell);
if (*params / sizeof(cell) >= 4 && params[5] > 0) if (numParams >= 4 && params[5] > 0)
{ {
const char* wildcardedPath = g_LibSys.PathFormat("%s%s*", path, (path[length - 1] != '/' && path[length - 1] != '\\') ? "/" : ""); const char* wildcardedPath = g_LibSys.PathFormat("%s%s*", path, (path[length - 1] != '/' && path[length - 1] != '\\') ? "/" : "");
const char* pathID = get_amxstring(amx, params[6], 1, length); const char* pathID = get_amxstring(amx, params[6], 1, length);
@ -780,8 +780,9 @@ static cell AMX_NATIVE_CALL amx_open_dir(AMX *amx, cell *params)
} }
set_amxstring_utf8(amx, params[2], pFirst, strlen(pFirst), params[3] + 1); set_amxstring_utf8(amx, params[2], pFirst, strlen(pFirst), params[3] + 1);
cell* fileType = get_amxaddr(amx, params[4]);
*get_amxaddr(amx, params[4]) = g_FileSystem->FindIsDirectory(handle) ? FileType_Directory : FileType_File; *fileType = g_FileSystem->FindIsDirectory(handle) ? FileType_Directory : FileType_File;
return reinterpret_cast<cell>(new DirectoryHandle(reinterpret_cast<void*>(&handle), true)); return reinterpret_cast<cell>(new DirectoryHandle(reinterpret_cast<void*>(&handle), true));
} }
@ -795,7 +796,8 @@ static cell AMX_NATIVE_CALL amx_open_dir(AMX *amx, cell *params)
if (numParams >= 4) if (numParams >= 4)
{ {
*get_amxaddr(amx, params[4]) = dir->IsEntryDirectory() ? FileType_Directory : FileType_File; cell* fileType = get_amxaddr(amx, params[4]);
*fileType = dir->IsEntryDirectory() ? FileType_Directory : FileType_File;
} }
const char* entry = dir->GetEntryName(); const char* entry = dir->GetEntryName();
@ -858,7 +860,8 @@ static cell AMX_NATIVE_CALL amx_get_dir(AMX *amx, cell *params)
if (numParams >= 4) if (numParams >= 4)
{ {
*get_amxaddr(amx, params[4]) = g_FileSystem->FindIsDirectory(*handle) ? FileType_Directory : FileType_File; cell* fileType = get_amxaddr(amx, params[4]);
*fileType = g_FileSystem->FindIsDirectory(*handle) ? FileType_Directory : FileType_File;
} }
set_amxstring_utf8(amx, params[2], entry, strlen(entry), params[3] + 1); set_amxstring_utf8(amx, params[2], entry, strlen(entry), params[3] + 1);
@ -881,7 +884,8 @@ static cell AMX_NATIVE_CALL amx_get_dir(AMX *amx, cell *params)
if (numParams >= 4) if (numParams >= 4)
{ {
*get_amxaddr(amx, params[4]) = handle->IsEntryDirectory() ? FileType_Directory : FileType_File; cell* fileType = get_amxaddr(amx, params[4]);
*fileType = handle->IsEntryDirectory() ? FileType_Directory : FileType_File;
} }
const char* entry = handle->GetEntryName(); const char* entry = handle->GetEntryName();