From 5c955c824e09eb40f082518a382375168e1b797a Mon Sep 17 00:00:00 2001
From: dborth <dborth@d154fe42-be53-0410-aac0-356034171556>
Date: Fri, 12 Jun 2009 07:47:42 +0000
Subject: [PATCH] better path handling code

---
 source/ngc/filebrowser.cpp | 36 ++++++++++++++++++++++++++++++------
 source/ngc/fileop.cpp      | 25 ++++++++++++++-----------
 source/ngc/networkop.cpp   |  2 ++
 3 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/source/ngc/filebrowser.cpp b/source/ngc/filebrowser.cpp
index 271e28b..4bfabf8 100644
--- a/source/ngc/filebrowser.cpp
+++ b/source/ngc/filebrowser.cpp
@@ -21,9 +21,7 @@
 #include <malloc.h>
 
 #ifdef HW_RVL
-extern "C" {
 #include <di/di.h>
-}
 #endif
 
 #include "snes9x.h"
@@ -135,6 +133,28 @@ void ResetBrowser()
 	memset(browserList, 0, sizeof(BROWSERENTRY));
 }
 
+/****************************************************************************
+ * CleanupPath()
+ * Cleans up the filepath, removing double // and replacing \ with /
+ ***************************************************************************/
+static void CleanupPath(char * path)
+{
+	int pathlen = strlen(path);
+	int j = 0;
+	for(int i=0; i < pathlen && i < MAXPATHLEN; i++)
+	{
+		if(path[i] == '\\')
+			path[i] = '/';
+
+		if(j == 0 || !(path[j-1] == '/' && path[i] == '/'))
+			path[j++] = path[i];
+	}
+	path[j] = 0;
+
+	if(strlen(path) == 0)
+		sprintf(path, "/");
+}
+
 /****************************************************************************
  * UpdateDirName()
  * Update curent directory name for file browser
@@ -179,7 +199,7 @@ int UpdateDirName(int method)
 		if ((strlen(browser.dir)+1+strlen(browserList[browser.selIndex].filename)) < MAXPATHLEN)
 		{
 			/* update current directory name */
-			sprintf(browser.dir, "%s/%s",browser.dir, browserList[browser.selIndex].filename);
+			sprintf(browser.dir, "%s%s/",browser.dir, browserList[browser.selIndex].filename);
 			return 1;
 		}
 		else
@@ -208,7 +228,7 @@ bool MakeFilePath(char filepath[], int type, int method, char * filename, int fi
 		}
 		else
 		{
-			sprintf(temppath, "%s/%s",browser.dir,browserList[browser.selIndex].filename);
+			sprintf(temppath, "%s%s",browser.dir,browserList[browser.selIndex].filename);
 		}
 	}
 	else
@@ -277,10 +297,11 @@ bool MakeFilePath(char filepath[], int type, int method, char * filename, int fi
 				temppath[31] = 0; // truncate filename
 				break;
 			default:
-				sprintf (temppath, "%s/%s", folder, file);
+				sprintf (temppath, "/%s/%s", folder, file);
 				break;
 		}
 	}
+	CleanupPath(temppath); // cleanup path
 	strncpy(filepath, temppath, MAXPATHLEN);
 	return true;
 }
@@ -525,6 +546,8 @@ int BrowserChangeFolder(int method)
 	if(!UpdateDirName(method))
 		return -1;
 
+	CleanupPath(browser.dir);
+
 	switch (method)
 	{
 		case METHOD_DVD:
@@ -566,7 +589,8 @@ OpenGameList ()
 					SwitchDVDFolder(GCSettings.LoadFolder); // switch to ROM folder
 			break;
 		default:
-			sprintf(browser.dir, "/%s", GCSettings.LoadFolder);
+			sprintf(browser.dir, "/%s/", GCSettings.LoadFolder);
+			CleanupPath(browser.dir);
 			ParseDirectory(method); // Parse root directory
 			break;
 	}
diff --git a/source/ngc/fileop.cpp b/source/ngc/fileop.cpp
index b42a079..9f92cf2 100644
--- a/source/ngc/fileop.cpp
+++ b/source/ngc/fileop.cpp
@@ -174,11 +174,11 @@ InitDeviceThread()
 void UnmountAllFAT()
 {
 #ifdef HW_RVL
-	fatUnmount("sd:/");
-	fatUnmount("usb:/");
+	fatUnmount("sd:");
+	fatUnmount("usb:");
 #else
-	fatUnmount("carda:/");
-	fatUnmount("cardb:/");
+	fatUnmount("carda:");
+	fatUnmount("cardb:");
 #endif
 }
 
@@ -222,7 +222,7 @@ bool MountFAT(int method)
 			return false; // unknown device
 	}
 
-	sprintf(rootdir, "%s:/", name);
+	sprintf(rootdir, "%s:", name);
 
 	if(unmountRequired[method])
 	{
@@ -285,27 +285,29 @@ bool ChangeInterface(int method, bool silent)
 	}
 	else if(method == METHOD_DVD)
 	{
-		rootdir[0] = 0;
 		mounted = MountDVD(silent);
 	}
 #ifdef HW_RVL
 	else if(method == METHOD_SMB)
 	{
-		sprintf(rootdir, "smb:/");
 		mounted = ConnectShare(silent);
 	}
 #endif
 	else if(method == METHOD_MC_SLOTA)
 	{
-		rootdir[0] = 0;
 		mounted = TestMC(CARD_SLOTA, silent);
 	}
 	else if(method == METHOD_MC_SLOTB)
 	{
-		rootdir[0] = 0;
 		mounted = TestMC(CARD_SLOTB, silent);
 	}
 
+	if(!mounted)
+	{
+		sprintf(browser.dir,"/");
+		rootdir[0] = 0;
+	}
+
 	return mounted;
 }
 
@@ -349,7 +351,8 @@ ParseDirectory(int method)
 		if(ChangeInterface(method, SILENT))
 		{
 			sprintf(browser.dir,"/");
-			dir = diropen(rootdir);
+			sprintf(fulldir, "%s%s", rootdir, browser.dir);
+			dir = diropen(fulldir);
 			if (dir == NULL)
 			{
 				sprintf(msg, "Error opening %s", rootdir);
@@ -648,7 +651,7 @@ SaveFile (char * buffer, char *filepath, u32 datasize, int method, bool silent)
 	ResumeDeviceThread();
 
 	CancelAction();
-    return written;
+	return written;
 }
 
 u32 SaveFile(char * filepath, u32 datasize, int method, bool silent)
diff --git a/source/ngc/networkop.cpp b/source/ngc/networkop.cpp
index ad7d74e..796cb39 100644
--- a/source/ngc/networkop.cpp
+++ b/source/ngc/networkop.cpp
@@ -20,6 +20,7 @@
 #include "menu.h"
 #include "fileop.h"
 #include "http.h"
+#include "filebrowser.h"
 
 static bool inNetworkInit = false;
 static bool networkInit = false;
@@ -295,6 +296,7 @@ ConnectShare (bool silent)
 					GCSettings.smbshare, GCSettings.smbip))
 			{
 				networkShareInit = true;
+				sprintf(rootdir, "smb:");
 			}
 
 			if(!silent)