Mercurial > vim
changeset 11727:cb1dc90d22cc v8.0.0746
patch 8.0.0746: when :term fails the job is not properly cleaned up
commit https://github.com/vim/vim/commit/61a6605ea1201eb49a126ca696fcfc56caf5dca6
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 22 18:39:00 2017 +0200
patch 8.0.0746: when :term fails the job is not properly cleaned up
Problem: When :term fails the job is not properly cleaned up.
Solution: Free the terminal. Handle a job that failed to start. (closes
#1858)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 22 Jul 2017 18:45:04 +0200 |
| parents | a18dff800264 |
| children | 628bdcdbf50c |
| files | src/channel.c src/os_unix.c src/terminal.c src/version.c |
| diffstat | 4 files changed, 18 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/channel.c +++ b/src/channel.c @@ -5189,6 +5189,11 @@ job_stop(job_T *job, typval_T *argvars, return 0; } } + if (job->jv_status == JOB_FAILED) + { + ch_log(job->jv_channel, "Job failed to start, job_stop() skipped"); + return 0; + } if (job->jv_status == JOB_ENDED) { ch_log(job->jv_channel, "Job has already ended, job_stop() skipped");
--- a/src/os_unix.c +++ b/src/os_unix.c @@ -5475,7 +5475,9 @@ mch_stop_job(job_T *job, char_u *how) job_pid = -job_pid; #endif - kill(job_pid, sig); + /* Never kill ourselves! */ + if (job_pid != 0) + kill(job_pid, sig); return OK; }
--- a/src/terminal.c +++ b/src/terminal.c @@ -203,6 +203,9 @@ ex_terminal(exarg_T *eap) } else { + free_terminal(term); + curbuf->b_term = NULL; + /* Wiping out the buffer will also close the window and call * free_terminal(). */ do_buffer(DOBUF_WIPE, DOBUF_CURRENT, FORWARD, 0, TRUE); @@ -235,7 +238,8 @@ free_terminal(term_T *term) if (term->tl_job != NULL) { - if (term->tl_job->jv_status != JOB_ENDED) + if (term->tl_job->jv_status != JOB_ENDED + && term->tl_job->jv_status != JOB_FAILED) job_stop(term->tl_job, NULL, "kill"); job_unref(term->tl_job); } @@ -941,7 +945,9 @@ term_and_job_init(term_T *term, int rows setup_job_options(&opt, rows, cols); term->tl_job = job_start(argvars, &opt); - return term->tl_job != NULL ? OK : FAIL; + return term->tl_job != NULL + && term->tl_job->jv_channel != NULL + && term->tl_job->jv_status != JOB_FAILED ? OK : FAIL; } /*