diff options
| author | Dan Gudmundsson <[email protected]> | 2013-02-19 16:14:49 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-05-20 13:35:44 +0200 |
| commit | 46d99ecfdc8b5d1f6d35c415d020eca5cd6130e1 (patch) | |
| tree | 162987e1b0f52449926672f7533baed1c9612dac | |
| parent | b3152d85b1f0187d82270a607006494a04c98546 (diff) | |
| download | otp-46d99ecfdc8b5d1f6d35c415d020eca5cd6130e1.tar.gz otp-46d99ecfdc8b5d1f6d35c415d020eca5cd6130e1.tar.bz2 otp-46d99ecfdc8b5d1f6d35c415d020eca5cd6130e1.zip | |
Quote windows paths with spaces
| -rw-r--r-- | erts/test/nt_SUITE.erl | 4 | ||||
| -rw-r--r-- | lib/os_mon/src/nteventlog.erl | 5 | ||||
| -rw-r--r-- | lib/sasl/src/erlsrv.erl | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/erts/test/nt_SUITE.erl b/erts/test/nt_SUITE.erl index 7580a7b364..2e4184e7f1 100644 --- a/erts/test/nt_SUITE.erl +++ b/erts/test/nt_SUITE.erl @@ -74,7 +74,7 @@ end_per_testcase(_Func, Config) -> ok. erlsrv() -> - os:find_executable(erlsrv). + "\"" ++ os:find_executable(erlsrv) ++ "\"". recv_prog_output(Port) -> @@ -542,7 +542,7 @@ get_current_procs(Config) -> ?line erl_parse:parse_term(Tok). nt_info(Config) when is_list(Config) -> - ?line filename:join(?config(data_dir, Config), "nt_info"). + ?line "\"" ++ filename:join(?config(data_dir, Config), "nt_info") ++ "\"". logdir(Config) -> diff --git a/lib/os_mon/src/nteventlog.erl b/lib/os_mon/src/nteventlog.erl index d624048c29..1fdc0f2025 100644 --- a/lib/os_mon/src/nteventlog.erl +++ b/lib/os_mon/src/nteventlog.erl @@ -121,9 +121,8 @@ code_change(_OldVsn, State, _Extra) -> %%---------------------------------------------------------------------- start_portprogram(Identifier) -> - Command = - filename:join([code:priv_dir(os_mon),"bin","nteventlog.exe"]) ++ - " " ++ make_list(Identifier), + Command = "\"" ++ filename:join([code:priv_dir(os_mon),"bin","nteventlog.exe"]) ++ + "\" " ++ make_list(Identifier), open_port({spawn,Command},[{packet,2}]). make_list(X) when is_atom(X) -> diff --git a/lib/sasl/src/erlsrv.erl b/lib/sasl/src/erlsrv.erl index 086dc7c651..67f6941479 100644 --- a/lib/sasl/src/erlsrv.erl +++ b/lib/sasl/src/erlsrv.erl @@ -30,7 +30,7 @@ erlsrv(EVer) -> Root = code:root_dir(), - filename:join([Root, "erts-" ++ EVer, "bin", "erlsrv.exe"]). + "\"" ++ filename:join([Root, "erts-" ++ EVer, "bin", "erlsrv.exe"]) ++ "\"". current_version() -> hd(string:tokens(erlang:system_info(version),"_ ")). |