From b941610b81aae5bc2b1fbd1adb3264a1e7ec7037 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Fri, 20 May 2016 14:17:40 +0300
Subject: [PATCH] fix mago-mi compatibility

---
 src/ddebug/gdb/gdbinterface.d      | 30 +++++++++++++++++++++++++++++-
 src/dlangide/builders/extprocess.d |  8 +++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/ddebug/gdb/gdbinterface.d b/src/ddebug/gdb/gdbinterface.d
index 680d7d4..72fe690 100644
--- a/src/ddebug/gdb/gdbinterface.d
+++ b/src/ddebug/gdb/gdbinterface.d
@@ -344,6 +344,34 @@ class GDBInterface : ConsoleDebuggerInterface, TextCommandTarget {
         return null;
     }
 
+    static string quotePathIfNeeded(string s) {
+        char[] buf;
+        buf.assumeSafeAppend();
+        bool hasSpaces = false;
+        for(uint i = 0; i < s.length; i++) {
+            if (s[i] == ' ')
+                hasSpaces = true;
+        }
+        if (hasSpaces)
+            buf ~= '\"';
+        for(uint i = 0; i < s.length; i++) {
+            char ch = s[i];
+            if (ch == '\t')
+                buf ~= "\\t";
+            else if (ch == '\n')
+                buf ~= "\\n";
+            else if (ch == '\r')
+                buf ~= "\\r";
+            else if (ch == '\\')
+                buf ~= "\\\\";
+            else 
+                buf ~= ch;
+        }
+        if (hasSpaces)
+            buf ~= '\"';
+        return buf.dup;
+    }
+
     class AddBreakpointRequest : GDBRequest {
         GDBBreakpoint gdbbp;
         this(Breakpoint bp) { 
@@ -353,7 +381,7 @@ class GDBInterface : ConsoleDebuggerInterface, TextCommandTarget {
             cmd ~= "-break-insert ";
             if (!bp.enabled)
                 cmd ~= "-d "; // create disabled
-            cmd ~= bp.fullFilePath;
+            cmd ~= quotePathIfNeeded(bp.fullFilePath);
             cmd ~= ":";
             cmd ~= to!string(bp.line);
             command = cmd.dup; 
diff --git a/src/dlangide/builders/extprocess.d b/src/dlangide/builders/extprocess.d
index a381c16..0b5d55a 100644
--- a/src/dlangide/builders/extprocess.d
+++ b/src/dlangide/builders/extprocess.d
@@ -8,6 +8,7 @@ import std.utf;
 import std.stdio;
 import core.thread;
 import core.sync.mutex;
+import dlangui.core.files;
 
 /// interface to forward process output to
 interface TextWriter {
@@ -293,7 +294,12 @@ class ExternalProcess {
     ExternalProcessState run(char[] program, char[][]args, char[] dir, TextWriter stdoutTarget, TextWriter stderrTarget = null) {
         Log.d("ExternalProcess.run ", program, " ", args);
         _state = ExternalProcessState.None;
-        _program = program;
+        _program = findExecutablePath(cast(string)program).dup;
+        if (!_program) {
+            _state = ExternalProcessState.Error;
+            Log.e("Executable not found for ", program);
+            return _state;
+        }
         _args = args;
         _workDir = dir;
         _stdout = stdoutTarget;