From 8a0782976c0c8da839876166013b84756dae493a Mon Sep 17 00:00:00 2001
From: Adam Chlipala <adam@chlipala.net>
Date: Wed, 15 Jun 2011 09:52:06 -0400
Subject: Handle spaces in filenames passed to GCC (caught by Zachary Tatlock)

---
 src/compiler.sml   | 8 +++++---
 tests/has space.ur | 2 ++
 tests/spacey.ur    | 1 +
 tests/spacey.urp   | 3 +++
 4 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 tests/has space.ur
 create mode 100644 tests/spacey.ur
 create mode 100644 tests/spacey.urp

diff --git a/src/compiler.sml b/src/compiler.sml
index 6d9c8166..27529251 100644
--- a/src/compiler.sml
+++ b/src/compiler.sml
@@ -1307,6 +1307,8 @@ val sqlify = {
 
 val toSqlify = transform sqlify "sqlify" o toMono_opt2
 
+val escapeFilename = String.translate (fn #" " => "\\ " | #"\"" => "\\\"" | #"'" => "\\'" | ch => str ch)
+
 fun compileC {cname, oname, ename, libs, profile, debug, link = link'} =
     let
         val proto = Settings.currentProtocol ()
@@ -1318,10 +1320,10 @@ fun compileC {cname, oname, ename, libs, profile, debug, link = link'} =
 
         val compile = "gcc " ^ Config.gccArgs ^ " -Wimplicit -Werror -O3 -fno-inline -I " ^ Config.includ
                       ^ " " ^ #compile proto
-                      ^ " -c " ^ cname ^ " -o " ^ oname
+                      ^ " -c " ^ escapeFilename cname ^ " -o " ^ escapeFilename oname
 
-        val link = "gcc -Werror -O3 -lm -pthread " ^ Config.gccArgs ^ " " ^ lib ^ " " ^ Config.openssl ^ " " ^ oname
-                   ^ " -o " ^ ename ^ " " ^ libs
+        val link = "gcc -Werror -O3 -lm -pthread " ^ Config.gccArgs ^ " " ^ lib ^ " " ^ Config.openssl ^ " " ^ escapeFilename oname
+                   ^ " -o " ^ escapeFilename ename ^ " " ^ libs
 
         val (compile, link) =
             if profile then
diff --git a/tests/has space.ur b/tests/has space.ur
new file mode 100644
index 00000000..4dec8c0c
--- /dev/null
+++ b/tests/has space.ur	
@@ -0,0 +1,2 @@
+fun main () : transaction page = return <xml>Hehe</xml>
+
diff --git a/tests/spacey.ur b/tests/spacey.ur
new file mode 100644
index 00000000..22c5e3ae
--- /dev/null
+++ b/tests/spacey.ur
@@ -0,0 +1 @@
+fun main () : transaction page = return <xml/>
diff --git a/tests/spacey.urp b/tests/spacey.urp
new file mode 100644
index 00000000..47ba25cb
--- /dev/null
+++ b/tests/spacey.urp
@@ -0,0 +1,3 @@
+exe has space.exe
+
+spacey
-- 
cgit v1.2.3