diff options
| author | Siri Hansen <[email protected]> | 2013-06-05 14:52:22 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-06-05 14:52:22 +0200 |
| commit | 23623a4837f3971623549c73257474d828fe25f2 (patch) | |
| tree | 40ddd5b6c10184db79a2010ae9a4fd5b68eda32f /lib/os_mon | |
| parent | af03cbc7b14fc504e181332d6902de109049725f (diff) | |
| parent | dd850c00803939e44d7f2ea6659825d0ab861b9d (diff) | |
| download | otp-23623a4837f3971623549c73257474d828fe25f2.tar.gz otp-23623a4837f3971623549c73257474d828fe25f2.tar.bz2 otp-23623a4837f3971623549c73257474d828fe25f2.zip | |
Merge branch 'siri/spawn-and-space'
* siri/spawn-and-space:
[sasl] In test, quote erlsrv executable in call to open_port/2
[test_server] Quote path to erl executable when starting slave nodes
Quote path to erl executable in slave to allow space in path
[sasl] Quote path to program run with open_port({spawn,...
[os_mon] Quote path to programs run with open_port({spawn,...
Conflicts:
lib/os_mon/src/nteventlog.erl
Diffstat (limited to 'lib/os_mon')
| -rw-r--r-- | lib/os_mon/src/nteventlog.erl | 5 | ||||
| -rw-r--r-- | lib/os_mon/src/os_sup.erl | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/os_mon/src/nteventlog.erl b/lib/os_mon/src/nteventlog.erl index 1fdc0f2025..97eaf07179 100644 --- a/lib/os_mon/src/nteventlog.erl +++ b/lib/os_mon/src/nteventlog.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1998-2009. All Rights Reserved. +%% Copyright Ericsson AB 1998-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -121,7 +121,8 @@ code_change(_OldVsn, State, _Extra) -> %%---------------------------------------------------------------------- start_portprogram(Identifier) -> - Command = "\"" ++ filename:join([code:priv_dir(os_mon),"bin","nteventlog.exe"]) ++ + Command = + "\"" ++ filename:join([code:priv_dir(os_mon),"bin","nteventlog.exe"]) ++ "\" " ++ make_list(Identifier), open_port({spawn,Command},[{packet,2}]). diff --git a/lib/os_mon/src/os_sup.erl b/lib/os_mon/src/os_sup.erl index f5c6c138ba..3ad8b6e990 100644 --- a/lib/os_mon/src/os_sup.erl +++ b/lib/os_mon/src/os_sup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2009. All Rights Reserved. +%% Copyright Ericsson AB 1996-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -228,8 +228,8 @@ code_change(_OldVsn, State, _Extra) -> start_portprogram() -> OwnPath = os_mon:get_env(os_sup, os_sup_own), Command = - filename:join([code:priv_dir(os_mon), "bin", "ferrule"]) ++ - " " ++ OwnPath, + "\"" ++ filename:join([code:priv_dir(os_mon), "bin", "ferrule"]) ++ + "\" " ++ OwnPath, open_port({spawn, Command}, [{packet, 2}]). %% os:cmd(cmd_str(enable)) should be done BEFORE starting os_sup |