Merge branch 'lukas/otp/install_with_whitespace/OTP-10107' into maint

* lukas/otp/install_with_whitespace/OTP-10107:
  Update to work with space in include path
  Update to work with whitespace in exec path

3 files changed, 44 insertions, 31 deletions

diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile
index 5dac304e32..c830ebec95 100644
--- a/lib/ic/src/Makefile
+++ b/lib/ic/src/Makefile
@@ -196,23 +196,23 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/examples
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/c-client
-	$(INSTALL_DATA) $(CCL_EX_FILES) $(RELSYSDIR)/examples/c-client	
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/c-server
-	$(INSTALL_DATA) $(CSRV_EX_FILES) $(RELSYSDIR)/examples/c-server	
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/erl-plain
-	$(INSTALL_DATA) $(EPL_EX_FILES) $(RELSYSDIR)/examples/erl-plain
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/erl-genserv
-	$(INSTALL_DATA) $(ESRV_EX_FILES) $(RELSYSDIR)/examples/erl-genserv	
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/java-client-server
-	$(INSTALL_DATA) $(JAVA_EX_FILES) $(RELSYSDIR)/examples/java-client-server
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/all-against-all
-	$(INSTALL_DATA) $(MIXED_EX_FILES) $(RELSYSDIR)/examples/all-against-all
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/c-client"
+	$(INSTALL_DATA) $(CCL_EX_FILES) "$(RELSYSDIR)/examples/c-client"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/c-server"
+	$(INSTALL_DATA) $(CSRV_EX_FILES) "$(RELSYSDIR)/examples/c-server"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/erl-plain"
+	$(INSTALL_DATA) $(EPL_EX_FILES) "$(RELSYSDIR)/examples/erl-plain"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/erl-genserv"
+	$(INSTALL_DATA) $(ESRV_EX_FILES) "$(RELSYSDIR)/examples/erl-genserv"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/java-client-server"
+	$(INSTALL_DATA) $(JAVA_EX_FILES) "$(RELSYSDIR)/examples/java-client-server"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples/all-against-all"
+	$(INSTALL_DATA) $(MIXED_EX_FILES) "$(RELSYSDIR)/examples/all-against-all"
 
 release_docs_spec:
 
diff --git a/lib/ic/src/ic.erl b/lib/ic/src/ic.erl
index 50fad921c4..bc7ec8ba91 100644
--- a/lib/ic/src/ic.erl
+++ b/lib/ic/src/ic.erl
@@ -250,7 +250,7 @@ make_erl_options(Opts) ->
     Optimize = Opts#options.optimize,
     PreProc = 
 	lists:flatten(
-	  lists:map(fun(D) -> io_lib:format("-I~s ", [ic_util:to_list(D)]) end, 
+	  lists:map(fun(D) -> io_lib:format("-I\"~s\" ", [ic_util:to_list(D)]) end,
 		    Includes1)++
 	  lists:map(
 	    fun ({Name, Value}) ->
diff --git a/lib/ic/src/ic_pp.erl b/lib/ic/src/ic_pp.erl
index 8b53473caa..50eeeab48c 100644
--- a/lib/ic/src/ic_pp.erl
+++ b/lib/ic/src/ic_pp.erl
@@ -1894,23 +1894,37 @@ include_dir(Flags) when is_list(Flags)->
 include_dir(_Flags) ->
     [].
     
-include_dir(Flags,IncDir) ->
+include_dir(Flags,IncDirs) ->
     case string:str(Flags,"-I") of
 	0 ->
-	    lists:reverse(IncDir);
+	    lists:reverse(IncDirs);
 	X ->
-	    Rem2 = string:sub_string(Flags, X+2),
-	    Rem = string:strip(Rem2, left),
-	    Y = string:str(Rem," "),
-	    case string:str(Rem," ") of
-		0 ->
-		    lists:reverse([string:sub_string(Rem, Y+1)|IncDir]);
-		Y ->
-		    include_dir(string:sub_string(Rem, Y+1), 
-				[string:sub_string(Rem,1,Y-1)|IncDir])
-	    end
+	    {NewDir, RemainingFlags} =
+		gobble_inc_dir(string:sub_string(Flags, X+2),nq,[]),
+	    include_dir(RemainingFlags, [NewDir|IncDirs])
     end.
 
+% nq = not-quoted, q = quoted.
+% Possible strange scenarios:
+%  /usr/test\ ing/
+%  "/usr/test ing/"
+%  /usr/test\"ing/
+%  "/usr/test\"ing/"
+gobble_inc_dir([],nq,Acc) ->
+    % Only accept nq here, if we end up here in q mode the user has missed a "
+    {lists:reverse(Acc),[]};
+gobble_inc_dir([$\\,$"|R],Q,Acc) ->
+    gobble_inc_dir(R,Q,[$"|Acc]);
+gobble_inc_dir([$"|R],nq,Acc) ->
+    gobble_inc_dir(R,q,Acc);
+gobble_inc_dir([$"|R],q,Acc) ->
+    gobble_inc_dir(R,nq,Acc);
+gobble_inc_dir([$\\,$ |R],nq,Acc) ->
+    gobble_inc_dir(R,nq,[$ |Acc]);
+gobble_inc_dir([$ |R],nq,Acc) ->
+    {lists:reverse(Acc),R};
+gobble_inc_dir([C|R],Q,Acc) ->
+    gobble_inc_dir(R,Q,[C|Acc]).
 
 
 %%===============================================================
@@ -1954,7 +1968,6 @@ find_inc_file2(FileName, [D|Rem]) ->
 	      _ ->
 		  D++"/"
 	  end,
-
     case catch file:read_file_info(Dir++FileName) of
 	{ok, _} ->
 	    {ok, Dir++FileName};