From 80a07f768d466c3b64b6d4a631e0a2cc005177c7 Mon Sep 17 00:00:00 2001
From: Al Beano <albino@autistici.org>
Date: Tue, 30 May 2017 18:54:52 +0100
Subject: [PATCH] more (untested) windows bugfixes

---
 platform/other.go   |  9 +++++++++
 platform/windows.go | 10 ++++++++++
 wimp-get.go         |  6 +++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/platform/other.go b/platform/other.go
index fc89136..bc2ddc1 100644
--- a/platform/other.go
+++ b/platform/other.go
@@ -2,7 +2,16 @@
 
 package platform
 
+import(
+	"path"
+)
+
 func SanitiseFilename(filename string) (newName string, e error) {
 	newName = filename
 	return
 }
+
+func DirOf(filename string) (dirname string, e error) {
+	dirname = path.Dir(filename)
+	return
+}
diff --git a/platform/windows.go b/platform/windows.go
index 3ba3fd4..e52b4e8 100644
--- a/platform/windows.go
+++ b/platform/windows.go
@@ -15,3 +15,13 @@ func SanitiseFilename(filename string) (newName string, e error) {
 	newName = r.ReplaceAllString(filename, "")
 	return
 }
+
+func DirOf(filename string) (dirname string, e error) {
+	r, e := regexp.Compile(`[^\ ]+$`)
+	if e != nil {
+		return
+	}
+
+	dirname = r.ReplaceAllString(filename, "")
+	return
+}
diff --git a/wimp-get.go b/wimp-get.go
index d344210..1c1c2e1 100644
--- a/wimp-get.go
+++ b/wimp-get.go
@@ -30,7 +30,11 @@ func main() {
 	}
 
 	exe, _ := os.Executable()
-	wDir := path.Dir(exe)
+	wDir, e := platform.DirOf(exe)
+	if e != nil {
+		panic(e)
+	}
+
 	magicData, e := ioutil.ReadFile(wDir + "/magic.json")
 	if e != nil {
 		panic(e)