aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/ose/run_erl.c
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-11-05 15:33:24 +0100
committerMarcus Arendt <[email protected]>2014-11-05 15:33:24 +0100
commit682a6082159568f40615f03d12d44ee70edd14c6 (patch)
treed8e0d99da58c138834e744f4186a76a238c6d5dc /erts/etc/ose/run_erl.c
parent7513bb7670cf7081c4b70e240f99f9424b612f0b (diff)
parent9417f044ee3c291c2ea343c203aebdcc40597226 (diff)
downloadotp-682a6082159568f40615f03d12d44ee70edd14c6.tar.gz
otp-682a6082159568f40615f03d12d44ee70edd14c6.tar.bz2
otp-682a6082159568f40615f03d12d44ee70edd14c6.zip
Merge branch 'maint-17' into maint
Conflicts: OTP_VERSION
Diffstat (limited to 'erts/etc/ose/run_erl.c')
-rw-r--r--erts/etc/ose/run_erl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/etc/ose/run_erl.c b/erts/etc/ose/run_erl.c
index 6bb59b7f7e..8bc49a485e 100644
--- a/erts/etc/ose/run_erl.c
+++ b/erts/etc/ose/run_erl.c
@@ -495,7 +495,7 @@ int pass_on(ProgramState *s) {
#ifdef DEBUG
erts_run_erl_log_status("Pty master write; ");
#endif
- len = erts_run_erl_extract_ctrl_seq(buffer,len);
+ len = erts_run_erl_extract_ctrl_seq(buffer,len, s->ofd);
if (len > 0) {
int wlen = erts_run_erl_write_all(s->ofd, buffer, len);