From 486792e04237fd863f292596bbc4801f15d2a5c7 Mon Sep 17 00:00:00 2001
From: Bob Burger <burgerrg@gmail.com>
Date: Mon, 14 May 2018 11:59:55 -0400
Subject: [PATCH] Use Windows path separator character when finding boot files
 on Windows.

original commit: 553ac1ae4df56d547051fff5dbbaf82b979ea5e1
---
 LOG        | 2 ++
 c/scheme.c | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/LOG b/LOG
index f7f831ea71..78ea6ab0cc 100644
--- a/LOG
+++ b/LOG
@@ -935,3 +935,5 @@
     Mf-install.in, wininstall/*nt.wxs
 - Windows install now sets HeapSearchPath in the registry
     wininstall/product.wxs
+- Use Windows path separator character when finding boot files on Windows.
+    scheme.c
diff --git a/c/scheme.c b/c/scheme.c
index 12c9bf94a8..e54bb64c03 100644
--- a/c/scheme.c
+++ b/c/scheme.c
@@ -429,6 +429,7 @@ static const char *path_last(p) const char *p; {
 #define DEFAULT_HEAP_PATH "%x;%x\\..\\..\\boot\\%m"
 #endif
 #define SEARCHPATHSEP ';'
+#define PATHSEP '\\'
 
 static char *get_defaultheapdirs() {
   char *result;
@@ -441,6 +442,7 @@ static char *get_defaultheapdirs() {
 }
 #else /* not WIN32: */
 #define SEARCHPATHSEP ':'
+#define PATHSEP '/'
 #ifndef DEFAULT_HEAP_PATH
 #define DEFAULT_HEAP_PATH "/usr/lib/csv%v/%m:/usr/local/lib/csv%v/%m"
 #endif
@@ -516,7 +518,7 @@ static IBOOL next_path(path, name, ext, sp, dsp) char *path; const char *name, *
   /* unless entry was null, append name and ext onto path and return true with
    * updated path, sp, and possibly dsp */
     if (s != *sp) {
-      if (!DIRMARKERP(*(p - 1))) { setp('/'); }
+      if (!DIRMARKERP(*(p - 1))) { setp(PATHSEP); }
       t = name;
       while (*t != 0) setp(*t++);
       t = ext;