diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-04-04 11:55:44 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-04-04 11:55:44 +0200 |
| commit | bad78f7daf7299603ea807c90839450a5f1307ce (patch) | |
| tree | f9e762d3777793b78a25c4f6bf2e6fa35d6390f1 /erts | |
| parent | 67b849785c3bf82f8f4bcadfa202e8633737e430 (diff) | |
| parent | 0d4a6b50fe8a353b6b83befb115ee9e157275a02 (diff) | |
| download | otp-bad78f7daf7299603ea807c90839450a5f1307ce.tar.gz otp-bad78f7daf7299603ea807c90839450a5f1307ce.tar.bz2 otp-bad78f7daf7299603ea807c90839450a5f1307ce.zip | |
Merge branch 'fredrik/erts/to_erl_handshake/OTP-11012' into maint
* fredrik/erts/to_erl_handshake/OTP-11012:
Changed handshake from to_erl to run_erl, on behalf of shell search
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/etc/unix/run_erl.c | 2 | ||||
| -rw-r--r-- | erts/etc/unix/to_erl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c index 910be3dce8..a3bcdb85d9 100644 --- a/erts/etc/unix/run_erl.c +++ b/erts/etc/unix/run_erl.c @@ -682,7 +682,7 @@ static void pass_on(pid_t childpid) } } - if (!got_some && wfd && buf[0] == '\022') { + if (!got_some && wfd && buf[0] == '\014') { char wbuf[30]; int wlen = sn_printf(wbuf,sizeof(wbuf),"[run_erl v%u-%u]\n", RUN_ERL_HI_VER, RUN_ERL_LO_VER); diff --git a/erts/etc/unix/to_erl.c b/erts/etc/unix/to_erl.c index 754b349338..094006c5fd 100644 --- a/erts/etc/unix/to_erl.c +++ b/erts/etc/unix/to_erl.c @@ -353,7 +353,7 @@ int main(int argc, char **argv) * at the start of every new to_erl-session. */ - if (write(wfd, "\022", 1) < 0) { + if (write(wfd, "\014", 1) < 0) { fprintf(stderr, "Error in writing ^R to FIFO.\n"); } |