From 0144154b9d0bb541b11c0044ad2568ddee117cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= <daniel@turtleware.eu>
Date: Sat, 18 Feb 2017 19:14:34 +0100
Subject: [PATCH] prepare-args: coerce arguments for windows

---
 src/lsp/process.lsp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/lsp/process.lsp b/src/lsp/process.lsp
index 14381a6f7..1d292080a 100644
--- a/src/lsp/process.lsp
+++ b/src/lsp/process.lsp
@@ -47,9 +47,8 @@
                               #+windows :escape-arguments nil))))
 
 ;;;
-;;; Wrapper around si_run_program call. Thanks to that C interface
-;;; isn't clobbered with lispisms. Ultimately we'd want to have as
-;;; little as possible in unixsys.d.
+;;; Almighty EXT:RUN-PROGRAM. Built on top of SI:SPAWN-SUBPROCESS. For
+;;; simpler alternative see SI:RUN-PROGRAM-INNER.
 ;;;
 (defun run-program (command argv
                     &key
@@ -79,16 +78,17 @@
            #-windows
            (mapcar #'si:copy-to-simple-base-string args)
            #+windows
-           (with-output-to-string (str)
-             (loop for (arg . rest) on args
-                do (if (and escape-arguments
-                            (find-if (lambda (c)
-                                       (find c '(#\Space #\Tab #\")))
-                                     arg))
-                       (escape-arg arg str)
-                       (princ arg str))
-                  (when rest
-                    (write-char #\Space str))))))
+           (si:copy-to-simple-base-string
+            (with-output-to-string (str)
+              (loop for (arg . rest) on args
+                 do (if (and escape-arguments
+                             (find-if (lambda (c)
+                                        (find c '(#\Space #\Tab #\")))
+                                      arg))
+                        (escape-arg arg str)
+                        (princ arg str))
+                   (when rest
+                     (write-char #\Space str)))))))
 
     (setf input (process-stream input *standard-input*
                                 :direction :input