From be984d9bcc65536d7a3ceaaaca7323a08ca046b9 Mon Sep 17 00:00:00 2001
From: Darkvater <darkvater@openttd.org>
Date: Tue, 18 Oct 2005 20:18:05 +0000
Subject: [PATCH] (svn r3061) - CodeChange: revert r3056, r3057 and add a
 simpler fix to satisfy the needs of the absolute strict (eg. root directory
 is C:\ not C:)

---
 win32.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/win32.c b/win32.c
index 987a4ee1ef..19a11877ff 100644
--- a/win32.c
+++ b/win32.c
@@ -630,8 +630,9 @@ static HANDLE MyFindFirstFile(const char *path, const char *file, WIN32_FIND_DAT
 	UINT sem = SetErrorMode(SEM_FAILCRITICALERRORS); // disable 'no-disk' message box
 	HANDLE h;
 	char paths[MAX_PATH];
+	const char *s = strrchr(path, '\\');
 
-	snprintf(paths, sizeof(paths), "%s\\%s", path, file);
+	snprintf(paths, sizeof(paths), "%s%s%s", path, (s[1] == '\0') ? "" : "\\", file);
 	h = FindFirstFile(paths, fd);
 
 	SetErrorMode(sem); // restore previous setting
@@ -671,7 +672,7 @@ FiosItem *FiosGetSavegameList(int *num, int mode)
 	_fios_path = _fios_save_path;
 
 	// Parent directory, only if not of the type C:\.
-	if (_fios_path[2] != '\0') {
+	if (_fios_path[3] != '\0') {
 		fios = FiosAlloc();
 		fios->type = FIOS_TYPE_PARENT;
 		fios->mtime = 0;
@@ -900,12 +901,15 @@ char *FiosBrowseTo(const FiosItem *item)
 
 	switch (item->type) {
 		case FIOS_TYPE_DRIVE:
-			sprintf(path, "%c:", item->title[0]);
+			sprintf(path, "%c:\\", item->title[0]);
 			break;
 
 		case FIOS_TYPE_PARENT:
 			s = strrchr(path, '\\');
-			s[0] = '\0';
+			if (s != path + 2)
+				s[0] = '\0';
+			else
+				s[1] = '\0';
 			break;
 
 		case FIOS_TYPE_DIR: