diff options
| author | Lukas Larsson <[email protected]> | 2018-03-02 10:18:11 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-03-02 10:18:11 +0100 |
| commit | fb218aaf3ef9da8f21a95f7e5a96e0210812d04b (patch) | |
| tree | 129a01c9aac8670cfe7c6a6485a818bfa1425366 /lib/kernel/src | |
| parent | d17ef36e2f0c81540dfc71e77cce91a4ff604f0c (diff) | |
| parent | 8bf5e7b1d38faf9c495c34b2eff6044d700993ff (diff) | |
| download | otp-fb218aaf3ef9da8f21a95f7e5a96e0210812d04b.tar.gz otp-fb218aaf3ef9da8f21a95f7e5a96e0210812d04b.tar.bz2 otp-fb218aaf3ef9da8f21a95f7e5a96e0210812d04b.zip | |
Merge branch 'lukas/kernel/fix_os_cmd_max_size_win32/OTP-14940' into maint
* lukas/kernel/fix_os_cmd_max_size_win32/OTP-14940:
stdlib: Fix doc link in timer
kernel: Fix handling of os:cmd option max_size in win
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/os.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl index ae188ae932..a4b4f798f9 100644 --- a/lib/kernel/src/os.erl +++ b/lib/kernel/src/os.erl @@ -319,16 +319,16 @@ get_data(Port, MonRef, Eot, Sofar, Size, Max) -> iolist_to_binary(Sofar) end. -eot(_Bs, <<>>, _Size, _Max) -> +eot(Bs, <<>>, Size, Max) when Size + byte_size(Bs) < Max -> more; +eot(Bs, <<>>, Size, Max) -> + binary:part(Bs, {0, Max - Size}); eot(Bs, Eot, Size, Max) -> case binary:match(Bs, Eot) of - nomatch when Size + byte_size(Bs) < Max -> - more; {Pos, _} when Size + Pos < Max -> binary:part(Bs,{0, Pos}); _ -> - binary:part(Bs,{0, Max - Size}) + eot(Bs, <<>>, Size, Max) end. %% When port_close returns we know that all the |