From 851f61719985651e769f8df8246d5ddb855cc022 Mon Sep 17 00:00:00 2001
From: Aleksandr Vinokurov <aleksandr.vinokurov@billing.ru>
Date: Thu, 8 Nov 2012 13:59:12 +0400
Subject: Fix deep list argument error under Windows in os:cmd/1

Because of leeway in implementing os:cmd/1 under different OS there is
a difference in results when calling it with deep list
argument. os:cmd/1 specifies io_lib:chars() type for its argument and
io_lib functions can produce deep lists inspite of io_lib:chars()
result type specification. This commit flattens the argument for
erlang:open_port/2 (which is used under Windows) and expands the
os_SUITE to regress the bug.
---
 lib/kernel/src/os.erl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib/kernel/src/os.erl')

diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl
index 742c000cc1..2bded77fc4 100644
--- a/lib/kernel/src/os.erl
+++ b/lib/kernel/src/os.erl
@@ -187,11 +187,14 @@ cmd(Cmd) ->
 	{unix, _} ->
 	    unix_cmd(Cmd);
 	{win32, Wtype} ->
-	    Command = case {os:getenv("COMSPEC"),Wtype} of
+	    Command0 = case {os:getenv("COMSPEC"),Wtype} of
 			  {false,windows} -> lists:concat(["command.com /c", Cmd]);
 			  {false,_} -> lists:concat(["cmd /c", Cmd]);
 			  {Cspec,_} -> lists:concat([Cspec," /c",Cmd])
 		      end,
+            %% open_port/2 awaits string() in Command, but io_lib:chars() can be
+            %% deep lists according to io_lib module description.
+            Command = lists:flatten(Command0),
 	    Port = open_port({spawn, Command}, [stream, in, eof, hide]),
 	    get_data(Port, [])
     end.
-- 
cgit v1.2.3


From 2fe1d3ca9caabda3abf3d1cf438d3159999a06eb Mon Sep 17 00:00:00 2001
From: Aleksandr Vinokurov <aleksandr.vinokurov@billing.ru>
Date: Thu, 8 Nov 2012 14:01:40 +0400
Subject: Remove unnecessary whitespaces in os.erl and os_SUITE.erl

Conflicts:

	lib/kernel/test/os_SUITE.erl
---
 lib/kernel/src/os.erl | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'lib/kernel/src/os.erl')

diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl
index 2bded77fc4..ded03361ee 100644
--- a/lib/kernel/src/os.erl
+++ b/lib/kernel/src/os.erl
@@ -126,7 +126,7 @@ verify_executable(Name0, [Ext|Rest], OrigExtensions) ->
     end;
 verify_executable(Name, [], OrigExtensions) when OrigExtensions =/= [""] -> %% Windows
     %% Will only happen on windows, hence case insensitivity
-    case can_be_full_name(string:to_lower(Name),OrigExtensions) of 
+    case can_be_full_name(string:to_lower(Name),OrigExtensions) of
 	true ->
 	    verify_executable(Name,[""],[""]);
 	_ ->
@@ -150,7 +150,7 @@ split_path(Path) ->
 	{win32, _} ->
 	    {ok,Curr} = file:get_cwd(),
 	    split_path(Path, $;, [], [Curr]);
-	_ -> 
+	_ ->
 	    split_path(Path, $:, [], [])
     end.
 
@@ -216,7 +216,7 @@ unix_cmd(Cmd) ->
     end.
 
 %% The -s flag implies that only the positional parameters are set,
-%% and the commands are read from standard input. We set the 
+%% and the commands are read from standard input. We set the
 %% $1 parameter for easy identification of the resident shell.
 %%
 -define(SHELL, "/bin/sh -s unix:cmd 2>&1").
@@ -229,7 +229,7 @@ unix_cmd(Cmd) ->
 -spec start_port() -> port().
 start_port() ->
     Ref = make_ref(),
-    Request = {Ref,self()},    
+    Request = {Ref,self()},
     {Pid, Mon} = case whereis(?PORT_CREATOR_NAME) of
 		     undefined ->
 			 spawn_monitor(fun() ->
@@ -276,7 +276,7 @@ start_port_srv_handle({Ref,Client}) ->
 		    Port
 	    catch
 		error:Reason ->
-		    {Reason,erlang:get_stacktrace()}	    
+		    {Reason,erlang:get_stacktrace()}
 	    end,
     Client ! {Ref,Reply}.
 
@@ -358,16 +358,16 @@ get_data(Port, Sofar) ->
 	{Port, {data, Bytes}} ->
 	    get_data(Port, [Sofar|Bytes]);
 	{Port, eof} ->
-	    Port ! {self(), close}, 
+	    Port ! {self(), close},
 	    receive
 		{Port, closed} ->
 		    true
-	    end, 
+	    end,
 	    receive
-		{'EXIT',  Port,  _} -> 
+		{'EXIT',  Port,  _} ->
 		    ok
 	    after 1 ->				% force context switch
 		    ok
-	    end, 
+	    end,
 	    lists:flatten(Sofar)
     end.
-- 
cgit v1.2.3