diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-12-16 14:27:41 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-12-16 14:27:41 +0300 |
| commit | 7f3b9a4acc503709c89a501aaee304ff208bd995 (patch) | |
| tree | 73e2d477fc8664ccaffad9dbc000132c7fa82857 /src/nvim/os/pty_process_unix.c | |
| parent | 76ffe0c5aa51fe4fe14811e86867af2c711190a1 (diff) | |
| parent | 7afd26a6d189d1ca798f93db8661bd656a37265f (diff) | |
| download | rneovim-7f3b9a4acc503709c89a501aaee304ff208bd995.tar.gz rneovim-7f3b9a4acc503709c89a501aaee304ff208bd995.tar.bz2 rneovim-7f3b9a4acc503709c89a501aaee304ff208bd995.zip | |
Merge branch 'master' into hide-container-impl
Diffstat (limited to 'src/nvim/os/pty_process_unix.c')
| -rw-r--r-- | src/nvim/os/pty_process_unix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/os/pty_process_unix.c b/src/nvim/os/pty_process_unix.c index 53301e4b53..855ca2ae47 100644 --- a/src/nvim/os/pty_process_unix.c +++ b/src/nvim/os/pty_process_unix.c @@ -72,8 +72,7 @@ int pty_process_spawn(PtyProcess *ptyproc) ELOG("forkpty failed: %s", strerror(errno)); return status; } else if (pid == 0) { - init_child(ptyproc); - abort(); + init_child(ptyproc); // never returns } // make sure the master file descriptor is non blocking @@ -163,14 +162,15 @@ static void init_child(PtyProcess *ptyproc) FUNC_ATTR_NONNULL_ALL Process *proc = (Process *)ptyproc; if (proc->cwd && os_chdir(proc->cwd) != 0) { - fprintf(stderr, "chdir failed: %s\n", strerror(errno)); + ELOG("chdir failed: %s", strerror(errno)); return; } char *prog = ptyproc->process.argv[0]; setenv("TERM", ptyproc->term_name ? ptyproc->term_name : "ansi", 1); execvp(prog, ptyproc->process.argv); - fprintf(stderr, "execvp failed: %s: %s\n", strerror(errno), prog); + ELOG("execvp failed: %s: %s", strerror(errno), prog); + _exit(122); // 122 is EXEC_FAILED in the Vim source. } static void init_termios(struct termios *termios) FUNC_ATTR_NONNULL_ALL |