diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-10-13 16:22:09 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-10-13 16:22:09 +0200 |
| commit | 624891f3ef6a292b10bb17eccc48cbc6351aa1ba (patch) | |
| tree | 1e516623c17ec4e5a21b3fecf2c7054dd6046baf | |
| parent | d5784f9fc4e163f0d28f96b5bb45423a5d5a719b (diff) | |
| download | vim-git-624891f3ef6a292b10bb17eccc48cbc6351aa1ba.tar.gz | |
updated for version 7.3.023v7.3.023
Problem: External program may hang when it tries to write to the tty.
Solution: Don't close the slave tty until after the child exits. (Nikola
Knezevic)
| -rw-r--r-- | src/os_unix.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index b0e0f0211..150bdad6d 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -4168,7 +4168,6 @@ mch_call_shell(cmd, options) # ifdef FEAT_GUI if (pty_master_fd >= 0) { - close(pty_slave_fd); /* close slave side of pty */ fromshell_fd = pty_master_fd; toshell_fd = dup(pty_master_fd); } @@ -4637,6 +4636,14 @@ finished: break; } +# ifdef FEAT_GUI + /* Close slave side of pty. Only do this after the child has + * exited, otherwise the child may hang when it tries to write on + * the pty. */ + if (pty_master_fd >= 0) + close(pty_slave_fd); +# endif + /* Make sure the child that writes to the external program is * dead. */ if (wpid > 0) diff --git a/src/version.c b/src/version.c index 9db3fce9f..6b7742e97 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 23, +/**/ 22, /**/ 21, |