Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-29 09:35:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Changed GuiOrphanedDataCleanup to using a safer localtime function

Browse source
This commit is contained in:
Leon Styhre 2023-07-27 13:38:02 +02:00
parent 262c33a8af
commit 9e46d46dd5
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
es-app/src/guis/GuiOrphanedDataCleanup.cpp
View file

@ -327,8 +327,14 @@ void GuiOrphanedDataCleanup::cleanupMediaFiles()
int systemProcessedCount {0}; int systemProcessedCount {0};
if (cleanupFiles.size() > 0) { if (cleanupFiles.size() > 0) {
struct tm tm;
std::string dateString(20, '\0'); std::string dateString(20, '\0');
std::strftime(&dateString[0], 20, "%Y-%m-%d_%H%M%S", localtime(&currentTime)); #if defined(_WIN64)
localtime_s(&tm, &currentTime);
std::strftime(&dateString[0], 20, "%Y-%m-%d_%H%M%S", &tm);
#else
std::strftime(&dateString[0], 20, "%Y-%m-%d_%H%M%S", localtime_r(&currentTime, &tm));
#endif
dateString.erase(dateString.find('\0')); dateString.erase(dateString.find('\0'));
const std::string targetDirectory {mMediaDirectory + "CLEANUP/" + dateString + "/"}; const std::string targetDirectory {mMediaDirectory + "CLEANUP/" + dateString + "/"};
@ -549,8 +555,14 @@ void GuiOrphanedDataCleanup::cleanupGamelists()
} }
if (removeCount > 0) { if (removeCount > 0) {
struct tm tm;
std::string dateString(20, '\0'); std::string dateString(20, '\0');
std::strftime(&dateString[0], 20, "%Y-%m-%d_%H%M%S", localtime(&currentTime)); #if defined(_WIN64)
localtime_s(&tm, &currentTime);
std::strftime(&dateString[0], 20, "%Y-%m-%d_%H%M%S", &tm);
#else
std::strftime(&dateString[0], 20, "%Y-%m-%d_%H%M%S", localtime_r(&currentTime, &tm));
#endif
dateString.erase(dateString.find('\0')); dateString.erase(dateString.find('\0'));
const std::string targetDirectory { const std::string targetDirectory {
Utils::FileSystem::getParent( Utils::FileSystem::getParent(
@ -733,8 +745,14 @@ void GuiOrphanedDataCleanup::cleanupCollections()
} }
if (removeCount > 0) { if (removeCount > 0) {
struct tm tm;
std::string dateString(20, '\0'); std::string dateString(20, '\0');
std::strftime(&dateString[0], 20, "%Y-%m-%d_%H%M%S", localtime(&currentTime)); #if defined(_WIN64)
localtime_s(&tm, &currentTime);
std::strftime(&dateString[0], 20, "%Y-%m-%d_%H%M%S", &tm);
#else
std::strftime(&dateString[0], 20, "%Y-%m-%d_%H%M%S", localtime_r(&currentTime, &tm));
#endif
dateString.erase(dateString.find('\0')); dateString.erase(dateString.find('\0'));
const std::string targetDirectory {Utils::FileSystem::getParent(collectionFile) + const std::string targetDirectory {Utils::FileSystem::getParent(collectionFile) +
"/CLEANUP/" + dateString + "/"}; "/CLEANUP/" + dateString + "/"};