patch 8.0.0855: MS-Windows: can't get tty name of terminal

Problem:    MS-Windows: can't get tty name of terminal.
Solution:   Use the winpty process number. (Yasuhiro Matsumoto, closes #1929)

diff --git a/src/terminal.c b/src/terminal.c
index 9c165337bed9275cd3be8f63541367adb0fe0a99..d3dde181bae9da8dca624afdaa691698a8ee4269 100644 (file)
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -2201,6 +2201,7 @@ void (*winpty_spawn_config_free)(void*);
 void (*winpty_error_free)(void*);
 LPCWSTR (*winpty_error_msg)(void*);
 BOOL (*winpty_set_size)(void*, int, int, void*);
+HANDLE (*winpty_agent_process)(void*);
 
 #define WINPTY_DLL "winpty.dll"
 
@@ -2230,6 +2231,7 @@ dyn_winpty_init(void)
        {"winpty_spawn_config_new", (FARPROC*)&winpty_spawn_config_new},
        {"winpty_error_msg", (FARPROC*)&winpty_error_msg},
        {"winpty_set_size", (FARPROC*)&winpty_set_size},
+       {"winpty_agent_process", (FARPROC*)&winpty_agent_process},
        {NULL, NULL}
     };
 
@@ -2272,6 +2274,7 @@ term_and_job_init(term_T *term, int rows, int cols, char_u *cmd, jobopt_T *opt)
     HANDLE         jo = NULL, child_process_handle, child_thread_handle;
     void           *winpty_err;
     void           *spawn_config = NULL;
+    char           buf[MAX_PATH];
 
     if (!dyn_winpty_init())
        return FAIL;
@@ -2358,6 +2361,9 @@ term_and_job_init(term_T *term, int rows, int cols, char_u *cmd, jobopt_T *opt)
     job->jv_proc_info.dwProcessId = GetProcessId(child_process_handle);
     job->jv_job_object = jo;
     job->jv_status = JOB_STARTED;
+    sprintf(buf, "winpty://%lu",
+           GetProcessId(winpty_agent_process(term->tl_winpty)));
+    job->jv_tty_name = vim_strsave((char_u*)buf);
     ++job->jv_refcount;
     term->tl_job = job;
 

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 90bc58b8545b78f4c125fe786a30fece6756c214..987b1ee13b0b5ed68e7758a6a5729aa1a59c40e2 100644 (file)
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -34,7 +34,8 @@ func Test_terminal_basic()
     call assert_match("^/dev/", job_info(g:job).tty)
     call assert_match("^/dev/", term_gettty(''))
   else
-    call assert_equal("", job_info(g:job).tty)
+    call assert_match("^winpty://", job_info(g:job).tty)
+    call assert_match("^winpty://", term_gettty(''))
   endif
   call Stop_shell_in_terminal(buf)
   call term_wait(buf)

diff --git a/src/version.c b/src/version.c
index 25750b5c63457d5f1a33df21d889e6a17b1dc641..bf30da6b0bd3c2b208f83b1a1b915150fbae2085 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    855,
 /**/
     854,
 /**/