|
@@ -457,8 +457,7 @@ DefineEngineFunction(getDirectoryList, String, ( const char* path, S32 depth ),
|
|
char fullpath[1024];
|
|
char fullpath[1024];
|
|
|
|
|
|
#ifdef TORQUE_SECURE_VFS
|
|
#ifdef TORQUE_SECURE_VFS
|
|
- dMemset(fullpath, 0x00, sizeof(fullpath));
|
|
|
|
- dMemcpy(fullpath, path, dStrlen(path));
|
|
|
|
|
|
+ dStrcpy(fullpath, path, sizeof(fullpath));
|
|
#else
|
|
#else
|
|
Platform::makeFullPathName(String::compare(path, "/") == 0 ? "" : path, fullpath, sizeof(fullpath));
|
|
Platform::makeFullPathName(String::compare(path, "/") == 0 ? "" : path, fullpath, sizeof(fullpath));
|
|
#endif
|
|
#endif
|
|
@@ -475,11 +474,7 @@ DefineEngineFunction(getDirectoryList, String, ( const char* path, S32 depth ),
|
|
|
|
|
|
// Dump the directories.
|
|
// Dump the directories.
|
|
Vector<StringTableEntry> directories;
|
|
Vector<StringTableEntry> directories;
|
|
-#ifdef TORQUE_SECURE_VFS
|
|
|
|
Torque::FS::DumpDirectories(fullpath, directories, depth, true);
|
|
Torque::FS::DumpDirectories(fullpath, directories, depth, true);
|
|
-#else
|
|
|
|
- Platform::dumpDirectories(fullpath, directories, depth, true);
|
|
|
|
-#endif
|
|
|
|
|
|
|
|
if( directories.empty() )
|
|
if( directories.empty() )
|
|
return "";
|
|
return "";
|