BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Really delete things in fs::RecursiveDelete (#7433)

Browse Source 
* Really delete things in fs::RecursiveDelete
This commit is contained in:
Vitaliy 2018-08-18 12:00:06 +03:00 committed by Loïc Blot
parent 4937c5007f
commit 78bd902b9f
1 changed files with 23 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/filesys.cpp
View File

@ -125,46 +125,33 @@ bool IsDirDelimiter(char c)
bool RecursiveDelete(const std::string &path) bool RecursiveDelete(const std::string &path)
{ {
infostream<<"Recursively deleting \""<<path<<"\""<<std::endl; infostream << "Recursively deleting \"" << path << "\"" << std::endl;
if (!IsDir(path)) {
DWORD attr = GetFileAttributes(path.c_str()); infostream << "RecursiveDelete: Deleting file " << path << std::endl;
bool is_directory = (attr != INVALID_FILE_ATTRIBUTES && if (!DeleteFile(path.c_str())) {
(attr & FILE_ATTRIBUTE_DIRECTORY)); errorstream << "RecursiveDelete: Failed to delete file "
if(!is_directory) << path << std::endl;
{
infostream<<"RecursiveDelete: Deleting file "<<path<<std::endl;
//bool did = DeleteFile(path.c_str());
bool did = true;
if(!did){
errorstream<<"RecursiveDelete: Failed to delete file "
<<path<<std::endl;
return false; return false;
} }
return true;
} }
else infostream << "RecursiveDelete: Deleting content of directory "
{ << path << std::endl;
infostream<<"RecursiveDelete: Deleting content of directory "
<<path<<std::endl;
std::vector<DirListNode> content = GetDirListing(path); std::vector<DirListNode> content = GetDirListing(path);
for(size_t i=0; i<content.size(); i++){ for (const DirListNode &n: content) {
const DirListNode &n = content[i];
std::string fullpath = path + DIR_DELIM + n.name; std::string fullpath = path + DIR_DELIM + n.name;
bool did = RecursiveDelete(fullpath); if (!RecursiveDelete(fullpath)) {
if(!did){ errorstream << "RecursiveDelete: Failed to recurse to "
errorstream<<"RecursiveDelete: Failed to recurse to " << fullpath << std::endl;
<<fullpath<<std::endl;
return false; return false;
} }
} }
infostream<<"RecursiveDelete: Deleting directory "<<path<<std::endl; infostream << "RecursiveDelete: Deleting directory " << path << std::endl;
//bool did = RemoveDirectory(path.c_str(); if (!RemoveDirectory(path.c_str())) {
bool did = true; errorstream << "Failed to recursively delete directory "
if(!did){ << path << std::endl;
errorstream<<"Failed to recursively delete directory "
<<path<<std::endl;
return false; return false;
} }
}
return true; return true;
} }