diff options
| author | Dan Gudmundsson <[email protected]> | 2013-06-03 13:23:09 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-06-03 13:23:09 +0200 |
| commit | 4a409b130337f7b055f2fd644fa3f10c8a0783f8 (patch) | |
| tree | 879f3125ed8b569e25eefc02c3b5c5a201d824a3 /erts/preloaded | |
| parent | c97ac1a34971ce60bd36519e7ea51db2456217df (diff) | |
| parent | 0057676c3ebfd603658631088c977219ba2b0cc6 (diff) | |
| download | otp-4a409b130337f7b055f2fd644fa3f10c8a0783f8.tar.gz otp-4a409b130337f7b055f2fd644fa3f10c8a0783f8.tar.bz2 otp-4a409b130337f7b055f2fd644fa3f10c8a0783f8.zip | |
Merge branch 'dgud/erts/fix-spawn-unicode/OTP-11105'
* dgud/erts/fix-spawn-unicode/OTP-11105:
kernel: Handle unicode in os:cmd
erts: Change erlang:open_port/2 spec
erts: Change erlang:open_port spawn to handle unicode
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 93520 -> 93584 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex a5c43435df..226e4c8a1f 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 6929ca3fa5..0df0768365 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -1714,15 +1714,15 @@ nodes(_Arg) -> erlang:nif_error(undefined). -spec open_port(PortName, PortSettings) -> port() when - PortName :: {spawn, Command :: string()} | - {spawn_driver, Command :: [byte()]} | + PortName :: {spawn, Command :: string() | binary()} | + {spawn_driver, Command :: string() | binary()} | {spawn_executable, FileName :: file:name() } | {fd, In :: non_neg_integer(), Out :: non_neg_integer()}, PortSettings :: [Opt], Opt :: {packet, N :: 1 | 2 | 4} | stream | {line, L :: non_neg_integer()} - | {cd, Dir :: string()} + | {cd, Dir :: string() | binary()} | {env, Env :: [{Name :: string(), Val :: string() | false}]} | {args, [string() | binary()]} | {arg0, string() | binary()} |