thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.0846: cannot get the name of the pty of a job

Browse Source 
Problem:    Cannot get the name of the pty of a job.
Solution:   Add the "tty" entry to the job info. (Ozaki Kiichi, closes #1920)
            Add the term_gettty() function.
This commit is contained in:
Bram Moolenaar
2017-08-03 13:51:25 +02:00
parent d8dc179937
commit 7c9aec4ac8
9 changed files with 75 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/channel.c
View File

@@ -1016,11 +1016,9 @@ ch_close_part(channel_T *channel, ch_part_T part)
{
/* When using a pty the same FD is set on multiple parts, only
* close it when the last reference is closed. */
if ((part == PART_IN || channel->ch_part[PART_IN].ch_fd != *fd)
&& (part == PART_OUT
|| channel->ch_part[PART_OUT].ch_fd != *fd)
&& (part == PART_ERR
|| channel->ch_part[PART_ERR].ch_fd != *fd))
if ((part == PART_IN || channel->CH_IN_FD != *fd)
&& (part == PART_OUT || channel->CH_OUT_FD != *fd)
&& (part == PART_ERR || channel->CH_ERR_FD != *fd))
fd_close(*fd);
}
*fd = INVALID_FD;
@@ -4592,6 +4590,7 @@ job_free_contents(job_T *job)
}
mch_clear_job(job);
vim_free(job->jv_tty_name);
vim_free(job->jv_stoponexit);
free_callback(job->jv_exit_cb, job->jv_exit_partial);
}
@@ -5164,6 +5163,8 @@ job_info(job_T *job, dict_T *dict)
nr = job->jv_proc_info.dwProcessId;
#endif
dict_add_nr_str(dict, "process", nr, NULL);
dict_add_nr_str(dict, "tty", 0L,
job->jv_tty_name != NULL ? job->jv_tty_name : (char_u *)"");
dict_add_nr_str(dict, "exitval", job->jv_exitval, NULL);
dict_add_nr_str(dict, "exit_cb", 0L, job->jv_exit_cb);