minenux/minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Use built-in methods for deletion in RecursiveDelete

Browse Source
This commit is contained in:
Maksim 2022-05-17 13:23:54 +03:00
parent 78d8161031
commit 4047be93db
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/filesys.cpp
View File

@ -286,12 +286,13 @@ bool IsDirDelimiter(char c)
bool RecursiveDelete(const std::string &path) bool RecursiveDelete(const std::string &path)
{ {
infostream<<"Removing \""<<path<<"\""<<std::endl;
#if 0
/* /*
Execute the 'rm' command directly, by fork() and execve() Execute the 'rm' command directly, by fork() and execve()
*/ */
infostream<<"Removing \""<<path<<"\""<<std::endl;
pid_t child_pid = fork(); pid_t child_pid = fork();
if(child_pid == 0) if(child_pid == 0)
@ -326,6 +327,28 @@ bool RecursiveDelete(const std::string &path)
}while(tpid != child_pid); }while(tpid != child_pid);
return (child_status == 0); return (child_status == 0);
} }
#else
/*
Executing fork() and execve() is unsafe and unavailable on some platforms
*/
bool success = true;
std::vector<std::string> paths;
paths.push_back(path);
fs::GetRecursiveSubPaths(path, paths, true, {});
// Go backwards to successfully delete the output of GetRecursiveSubPaths
for (int i = paths.size() - 1; i >= 0; i--) {
const std::string &p = paths[i];
bool did = DeleteSingleFileOrEmptyDirectory(p);
if (!did) {
errorstream << "Failed to delete " << p << std::endl;
success = false;
}
}
return success;
#endif
} }
bool DeleteSingleFileOrEmptyDirectory(const std::string &path) bool DeleteSingleFileOrEmptyDirectory(const std::string &path)