diff options
| author | Lukas Larsson <[email protected]> | 2018-03-02 14:33:06 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-03-02 14:33:06 +0100 |
| commit | b9cc6b6aaeb5cd00026824a3d83ca797051fd61d (patch) | |
| tree | e73bc4c962c0355d063a7e01804c98f83652b26a /erts/emulator | |
| parent | 90c4ae8355240bd29eb229ae1fd26a2cc37ecb94 (diff) | |
| parent | 45a1da4e9dfdb912ea0bdff69d772618d8ce460f (diff) | |
| download | otp-b9cc6b6aaeb5cd00026824a3d83ca797051fd61d.tar.gz otp-b9cc6b6aaeb5cd00026824a3d83ca797051fd61d.tar.bz2 otp-b9cc6b6aaeb5cd00026824a3d83ca797051fd61d.zip | |
Merge branch 'lukas/erts/ecio_arg_fix'
* lukas/erts/ecio_arg_fix:
erts: Correctly ignore +secio true
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index 4846ccd2d3..e8048cfdfc 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -1746,6 +1746,7 @@ erl_start(int argc, char **argv) } else if (has_prefix("ecio", sub_param)) { /* ignore argument, eager check io no longer used */ + arg = get_arg(sub_param+4, argv[i+1], &i); } else if (has_prefix("pp", sub_param)) { arg = get_arg(sub_param+2, argv[i+1], &i); |