Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove usage of deprecated function readdir_r (and ugly Blackberry hack diren_large)

Browse source
This commit is contained in:
Henrik Rydgård 2019-01-08 12:29:59 +01:00
parent cb63df2a34
commit b572dc52a5
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Common/FileUtil.cpp
View file

@ -661,13 +661,13 @@ bool DeleteDirRecursively(const std::string &directory)
{
const std::string virtualName = ConvertWStringToUTF8(ffd.cFileName);
#else
struct dirent dirent, *result = NULL;
struct dirent *result = NULL;
DIR *dirp = opendir(directory.c_str());
if (!dirp)
return false;
// non windows loop
while (!readdir_r(dirp, &dirent, &result) && result)
while ((result = readdir(dirp)))
{
const std::string virtualName = result->d_name;
#endif
@ -723,13 +723,11 @@ void CopyDir(const std::string &source_path, const std::string &dest_path)
if (!File::Exists(source_path)) return;
if (!File::Exists(dest_path)) File::CreateFullPath(dest_path);
struct dirent_large { struct dirent entry; char padding[FILENAME_MAX+1]; };
struct dirent_large diren;
struct dirent *result = NULL;
DIR *dirp = opendir(source_path.c_str());
if (!dirp) return;
while (!readdir_r(dirp, (dirent*) &diren, &result) && result)
while ((result = readdir(dirp)))
{
const std::string virtualName(result->d_name);
// check for "." and ".."

5
Core/FileSystems/DirectoryFileSystem.cpp
View file

@ -66,9 +66,6 @@ static bool FixFilenameCase(const std::string &path, std::string &filename)
}
//TODO: lookup filename in cache for "path"
struct dirent_large { struct dirent entry; char padding[FILENAME_MAX+1]; } diren;
struct dirent_large;
struct dirent *result = NULL;
DIR *dirp = opendir(path.c_str());
@ -77,7 +74,7 @@ static bool FixFilenameCase(const std::string &path, std::string &filename)
bool retValue = false;
while (!readdir_r(dirp, (dirent*) &diren, &result) && result)
while ((result = readdir(dirp)))
{
if (strlen(result->d_name) != filenameSize)
continue;

4
ext/native/file/file_util.cpp
View file

@ -238,8 +238,6 @@ size_t getFilesInDir(const char *directory, std::vector<FileInfo> *files, const
{
const std::string virtualName = ConvertWStringToUTF8(ffd.cFileName);
#else
struct dirent_large { struct dirent entry; char padding[FILENAME_MAX+1]; };
struct dirent_large diren;
struct dirent *result = NULL;
//std::string directoryWithSlash = directory;
@ -250,7 +248,7 @@ size_t getFilesInDir(const char *directory, std::vector<FileInfo> *files, const
if (!dirp)
return 0;
// non windows loop
while (!readdir_r(dirp, (dirent*) &diren, &result) && result)
while ((result = readdir(dirp)))
{
const std::string virtualName(result->d_name);
#endif