From d8df2f28b69eb4ba5fda87505743f700bf912ed4 Mon Sep 17 00:00:00 2001
From: Joel Heaton <joel.j.heaton@gmail.com>
Date: Wed, 10 Jun 2015 21:49:10 +0100
Subject: [PATCH] fix deleting map/world data on Windows

---
 src/filesys.cpp | 47 +++++++++++++++++++++++++++--------------------
 src/porting.cpp |  5 +++--
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/filesys.cpp b/src/filesys.cpp
index 4322be9..5ee4b34 100644
--- a/src/filesys.cpp
+++ b/src/filesys.cpp
@@ -148,27 +148,34 @@ bool RecursiveDelete(std::string path)
 {
 	std::cerr<<"Removing \""<<path<<"\""<<std::endl;
 
-	// experiments
-	if (DeleteFile(path.c_str()))
-		return true;
+	DWORD attributes = GetFileAttributes(path.c_str());
 
-	// This silly function needs a double-null terminated string...
-	// Well, we'll just make sure it has at least two, then.
-	path += "\0\0";
-
-	SHFILEOPSTRUCT sfo;
-	sfo.hwnd = NULL;
-	sfo.wFunc = FO_DELETE;
-	sfo.pFrom = path.c_str();
-	sfo.pTo = NULL;
-	sfo.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOCONFIRMMKDIR;
-
-	int r = SHFileOperation(&sfo);
-
-	if(r != 0)
-		std::cerr<<"SHFileOperation returned "<<r<<std::endl;
-
-	//return (r == 0);
+	// Delete if it's a file, or call recursive delete if a directory
+	if(attributes == INVALID_FILE_ATTRIBUTES) {
+		std::cerr<<"Could not remove \""<<path<<"\""<<std::endl;
+		return false;
+	} else {
+		if(attributes == FILE_ATTRIBUTE_DIRECTORY) {
+			std::vector<DirListNode> dir_list = GetDirListing(path);
+			for(int i = 0; i < dir_list.size(); i++) {
+				DirListNode &node = dir_list[i];
+				std::string fpath = path + DIR_DELIM + node.name;
+				if(!RecursiveDelete(fpath)) {
+					std::cerr<<"Could not remove contents of \""<<fpath<<"\""<<std::endl;
+					return false;
+				}
+			}
+			if(!RemoveDirectory(path.c_str())) {
+				std::cerr<<"Could not remove \""<<path<<"\""<<std::endl;
+				return false;
+			}
+		} else {
+			if(!DeleteFile(path.c_str())) {
+				std::cerr<<"Could not remove \""<<path<<"\""<<std::endl;
+				return false;
+			}
+		}
+	}
 	return true;
 }
 
diff --git a/src/porting.cpp b/src/porting.cpp
index 4d6cad0..58198ea 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -205,12 +205,13 @@ void initializePaths(char* argv0)
 	len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
 	assert(len < buflen);
 	pathRemoveFile(buf, '\\');
+	pathRemoveFile(buf, '\\');
 
 	// Use "./bin/../data"
-	path_data = std::string(buf) + DIR_DELIM ".." DIR_DELIM "data";
+	path_data = std::string(buf) + DIR_DELIM + "data";
 
 	// Use "./bin/.."
-	path_userdata = std::string(buf) + DIR_DELIM "..";
+	path_userdata = std::string(buf);
 
 	/*
 		Linux