From 1088375b38db7dd197782982351885437b265d27 Mon Sep 17 00:00:00 2001
From: Eladash <elad3356p@gmail.com>
Date: Fri, 7 Jan 2022 19:16:03 +0200
Subject: [PATCH] Wipe clean VSH's temporary directory of choice at boot

---
 Utilities/File.cpp            | 4 ++--
 Utilities/File.h              | 2 +-
 rpcs3/Emu/System.cpp          | 8 ++++++++
 rpcs3/Emu/cache_utils.cpp     | 2 +-
 rpcs3/Emu/system_config.h     | 1 +
 rpcs3/Loader/TRP.cpp          | 2 +-
 rpcs3/rpcs3qt/main_window.cpp | 2 +-
 7 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Utilities/File.cpp b/Utilities/File.cpp
index f23bb336fe..a98fb8bae2 100644
--- a/Utilities/File.cpp
+++ b/Utilities/File.cpp
@@ -1788,7 +1788,7 @@ const std::string& fs::get_temp_dir()
 	return s_dir;
 }
 
-bool fs::remove_all(const std::string& path, bool remove_root)
+bool fs::remove_all(const std::string& path, bool remove_root, bool is_no_dir_ok)
 {
 	if (const auto root_dir = dir(path))
 	{
@@ -1817,7 +1817,7 @@ bool fs::remove_all(const std::string& path, bool remove_root)
 	}
 	else
 	{
-		return false;
+		return is_no_dir_ok;
 	}
 
 	if (remove_root)
diff --git a/Utilities/File.h b/Utilities/File.h
index 3ba01c5c39..a210d2216d 100644
--- a/Utilities/File.h
+++ b/Utilities/File.h
@@ -648,7 +648,7 @@ namespace fs
 	};
 
 	// Delete directory and all its contents recursively
-	bool remove_all(const std::string& path, bool remove_root = true);
+	bool remove_all(const std::string& path, bool remove_root = true, bool is_no_dir_ok = false);
 
 	// Get size of all files recursively
 	u64 get_dir_size(const std::string& path, u64 rounding_alignment = 1);
diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index 3e817bb3aa..333c0b7b87 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -381,7 +381,15 @@ void Emulator::Init(bool add_only)
 
 	// Limit cache size
 	if (!is_exitspawn && g_cfg.vfs.limit_cache_size)
+	{
 		rpcs3::cache::limit_cache_size();
+	}
+
+	// Wipe clean VSH's temporary directory of choice
+	if (g_cfg.vfs.empty_hdd0_tmp && !is_exitspawn && !fs::remove_all(dev_hdd0 + "tmp/", false, true))
+	{
+		sys_log.error("Could not clean /dev_hdd0/tmp/ (%s)", fs::g_tls_error);
+	}
 }
 
 void Emulator::SetUsr(const std::string& user)
diff --git a/rpcs3/Emu/cache_utils.cpp b/rpcs3/Emu/cache_utils.cpp
index 55671ebdf9..25dc292a89 100644
--- a/rpcs3/Emu/cache_utils.cpp
+++ b/rpcs3/Emu/cache_utils.cpp
@@ -96,7 +96,7 @@ namespace rpcs3::cache
 				break;
 			}
 
-			if (is_dir ? !fs::remove_all(name, true) : !fs::remove_file(name))
+			if (is_dir ? !fs::remove_all(name, true, true) : !fs::remove_file(name))
 			{
 				sys_log.error("Could not remove cache directory '%s' item '%s' (%s)", cache_location, item.name, fs::g_tls_error);
 				break;
diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h
index 83953d88a4..29bf6e6c33 100644
--- a/rpcs3/Emu/system_config.h
+++ b/rpcs3/Emu/system_config.h
@@ -94,6 +94,7 @@ struct cfg_root : cfg::node
 
 		cfg::_bool limit_cache_size{ this, "Limit disk cache size", false };
 		cfg::_int<0, 10240> cache_max_size{ this, "Disk cache maximum size (MB)", 5120 };
+		cfg::_bool empty_hdd0_tmp{ this, "Empty /dev_hdd0/tmp/", true };
 
 	} vfs{ this };
 
diff --git a/rpcs3/Loader/TRP.cpp b/rpcs3/Loader/TRP.cpp
index a43e85fdcf..4cd3d03470 100644
--- a/rpcs3/Loader/TRP.cpp
+++ b/rpcs3/Loader/TRP.cpp
@@ -56,7 +56,7 @@ bool TRPLoader::Install(std::string_view dest, bool /*show*/)
 
 	if (success)
 	{
-		success = fs::remove_all(local_path) || !fs::is_dir(local_path);
+		success = fs::remove_all(local_path, true, true);
 
 		if (success)
 		{
diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp
index abfff5b343..5cf96f7e53 100644
--- a/rpcs3/rpcs3qt/main_window.cpp
+++ b/rpcs3/rpcs3qt/main_window.cpp
@@ -2602,7 +2602,7 @@ void main_window::RemoveDiskCache()
 {
 	const std::string cache_dir = rpcs3::utils::get_hdd1_dir() + "/caches";
 
-	if (fs::is_dir(cache_dir) && fs::remove_all(cache_dir, false))
+	if (fs::remove_all(cache_dir, false))
 	{
 		QMessageBox::information(this, tr("Cache Cleared"), tr("Disk cache was cleared successfully"));
 	}