From f958aa8750c67d9b5d84d20fa969e328c6d6df00 Mon Sep 17 00:00:00 2001
From: Niklas DAHLQUIST <niklas.dahlquist@st.com>
Date: Tue, 2 Jul 2019 11:00:40 +0200
Subject: [PATCH] Handle path to shell containing space
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Escape spaces in path when executing statements in makefiles
that require shell. This ensures that the split between
binary and arguments are valid.

Signed-off-by: Niklas DAHLQUIST <niklas.dahlquist@st.com>
Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@st.com>
---
 src/job.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/job.c b/src/job.c
index 54dd284..f2e14c8 100644
--- a/src/job.c
+++ b/src/job.c
@@ -3292,7 +3292,7 @@ construct_command_argv_internal (char *line, char **restp, const char *shell,
        whichever happens first.  */
     for (cp = shell; *cp != '\0'; ++cp)
       {
-        if (strchr (sh_chars, *cp) != 0)
+        if (strchr (sh_chars, *cp) != 0 || ISSPACE(*cp))
           *(ap++) = '\\';
         *(ap++) = *cp;
       }
-- 
2.7.4

