From 2073583157d8ad204a2b5078ef1b1e25245af1e3 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sat, 17 Aug 2019 15:45:26 +1000
Subject: [PATCH] Fix typo, re-add Asnivor's implementations which may help on
 .NET Core

---
 BizHawk.Client.Common/PathManager.cs | 36 +++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.Common/PathManager.cs b/BizHawk.Client.Common/PathManager.cs
index 66ba78f4d2..f7f0911765 100644
--- a/BizHawk.Client.Common/PathManager.cs
+++ b/BizHawk.Client.Common/PathManager.cs
@@ -407,11 +407,25 @@ namespace BizHawk.Client.Common
 			var parentPath = string.IsNullOrWhiteSpace(system)
 				? GetGlobalBasePathAbsolute()
 				: MakeAbsolutePath(GetPlatformBase(system), system);
+#if true
 			if (!IsSubfolder(parentPath, absolutePath)) return absolutePath;
 
 			return OSTailoredCode.CurrentOS == OSTailoredCode.DistinctOS.Windows
 				? absolutePath.Replace(parentPath, ".")
 				: "./" + OSTailoredCode.SimpleSubshell("realpath", $"--relative-to=\"{parentPath}\" \"{absolutePath}\"", $"invalid path {absolutePath} or missing realpath binary");
+#else // written for Unix port but may be useful for .NET Core
+			if (!IsSubfolder(parentPath, absolutePath))
+			{
+				return OSTailoredCode.CurrentOS == OSTailoredCode.DistinctOS.Windows
+					|| parentPath.TrimEnd('.') != $"{absolutePath}/"
+						? absolutePath
+						: ".";
+			}
+
+			return OSTailoredCode.CurrentOS == OSTailoredCode.DistinctOS.Windows
+				? absolutePath.Replace(parentPath, ".")
+				: absolutePath.Replace(parentPath.TrimEnd('.'), "./");
+#endif
 		}
 
 		public static string MakeRelativeTo(string absolutePath, string basePath)
@@ -431,7 +445,7 @@ namespace BizHawk.Client.Common
 			{
 				var parentUri = new Uri(parentPath);
 
-				for (var childUri = new DirectoryInfo(childPath); childUri != null; childUri = childUri?.Parent)
+				for (var childUri = new DirectoryInfo(childPath).Parent; childUri != null; childUri = childUri?.Parent)
 				{
 					if (new Uri(childUri.FullName) == parentUri) return true;
 				}
@@ -439,8 +453,28 @@ namespace BizHawk.Client.Common
 				return false;
 			}
 
+#if true
 			return OSTailoredCode.SimpleSubshell("realpath", $"-L \"{childPath}\"", $"invalid path {childPath} or missing realpath binary")
 				.StartsWith(OSTailoredCode.SimpleSubshell("realpath", $"-L \"{parentPath}\"", $"invalid path {parentPath} or missing realpath binary"));
+#else // written for Unix port but may be useful for .NET Core
+			{
+				var parentUri = new Uri(parentPath.TrimEnd('.'));
+
+				try
+				{
+					for (var childUri = new DirectoryInfo(childPath).Parent; childUri != null; childUri = childUri?.Parent)
+					{
+						if (new Uri(childUri.FullName).AbsolutePath.TrimEnd('/') == parentUri.AbsolutePath.TrimEnd('/')) return true;
+					}
+				}
+				catch
+				{
+					// ignored
+				}
+
+				return false;
+			}
+#endif
 		}
 
 		/// <summary>