diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-08-01 22:24:26 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-08-01 22:24:26 +0200 |
| commit | fae428354213b54626ff9e29faa5fd86161da942 (patch) | |
| tree | 26926e8d68d6d6aef91561a83b51fd5bce5f856a /src/os_unix.c | |
| parent | 94053a51255121713f51c122eb0dbb46c120e6d4 (diff) | |
| download | vim-git-fae428354213b54626ff9e29faa5fd86161da942.tar.gz | |
patch 8.0.0839: cannot kill a job in a terminal with CTRL-Cv8.0.0839
Problem: Cannot kill a job in a terminal with CTRL-C.
Solution: Set the controlling tty and send SIGINT. (closes #1910)
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 50 |
1 files changed, 35 insertions, 15 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index c7c4367bd..fb2628c7e 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -4194,6 +4194,26 @@ open_pty(int *pty_master_fd, int *pty_slave_fd) } #endif +/* + * Send SIGINT to a child process if "c" is an interrupt character. + */ + void +may_send_sigint(int c UNUSED, pid_t pid UNUSED, pid_t wpid UNUSED) +{ +# ifdef SIGINT + if (c == Ctrl_C || c == intr_char) + { +# ifdef HAVE_SETSID + kill(-pid, SIGINT); +# else + kill(0, SIGINT); +# endif + if (wpid > 0) + kill(wpid, SIGINT); + } +# endif +} + int mch_call_shell( char_u *cmd, @@ -4765,23 +4785,12 @@ mch_call_shell( */ if (len == 1 && (pty_master_fd < 0 || cmd != NULL)) { -# ifdef SIGINT /* * Send SIGINT to the child's group or all * processes in our group. */ - if (ta_buf[ta_len] == Ctrl_C - || ta_buf[ta_len] == intr_char) - { -# ifdef HAVE_SETSID - kill(-pid, SIGINT); -# else - kill(0, SIGINT); -# endif - if (wpid > 0) - kill(wpid, SIGINT); - } -# endif + may_send_sigint(ta_buf[ta_len], pid, wpid); + if (pty_master_fd < 0 && toshell_fd >= 0 && ta_buf[ta_len] == Ctrl_D) { @@ -5360,15 +5369,26 @@ mch_job_start(char **argv, job_T *job, jobopt_T *options) if (null_fd >= 0) close(null_fd); + if (pty_slave_fd >= 0) + { + /* push stream discipline modules */ + SetupSlavePTY(pty_slave_fd); +# ifdef TIOCSCTTY + /* Try to become controlling tty (probably doesn't work, + * unless run by root) */ + ioctl(pty_slave_fd, TIOCSCTTY, (char *)NULL); +# endif + } + /* See above for type of argv. */ execvp(argv[0], argv); if (stderr_works) perror("executing job failed"); -#ifdef EXITFREE +# ifdef EXITFREE /* calling free_all_mem() here causes problems. Ignore valgrind * reporting possibly leaked memory. */ -#endif +# endif _exit(EXEC_FAILED); /* exec failed, return failure code */ } |