diff options
| author | Marcus Arendt <[email protected]> | 2014-11-05 15:34:37 +0100 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-11-05 15:34:37 +0100 |
| commit | 39cd804e0a04cad11daabcc671ea71594e96f47b (patch) | |
| tree | ca62a0934eba72cf6ab17e50905f5c695b0c7852 /erts/etc/unix | |
| parent | 0d18bf3268379df2b91e165a835426db77f015e3 (diff) | |
| parent | 682a6082159568f40615f03d12d44ee70edd14c6 (diff) | |
| download | otp-39cd804e0a04cad11daabcc671ea71594e96f47b.tar.gz otp-39cd804e0a04cad11daabcc671ea71594e96f47b.tar.bz2 otp-39cd804e0a04cad11daabcc671ea71594e96f47b.zip | |
Merge branch 'maint'
Conflicts:
erts/vsn.mk
Diffstat (limited to 'erts/etc/unix')
| -rw-r--r-- | erts/etc/unix/run_erl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c index 4b123b8911..049e83f9e4 100644 --- a/erts/etc/unix/run_erl.c +++ b/erts/etc/unix/run_erl.c @@ -490,7 +490,7 @@ static void pass_on(pid_t childpid) #ifdef DEBUG erts_run_erl_log_status("Pty master write; "); #endif - len = erts_run_erl_extract_ctrl_seq(buf, len); + len = erts_run_erl_extract_ctrl_seq(buf, len, mfd); if(len==1 && buf[0] == '\003') { kill(childpid,SIGINT); |