| aa887dad |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.3.023 |
| 3 | Fcc: outbox |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> |
| 5 | Mime-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | ------------ |
| 9 | |
| 10 | Patch 7.3.023 |
| 11 | Problem: External program may hang when it tries to write to the tty. |
| 12 | Solution: Don't close the slave tty until after the child exits. (Nikola |
| 13 | Knezevic) |
| 14 | Files: src/os_unix.c |
| 15 | |
| 16 | |
| 17 | *** ../vim-7.3.022/src/os_unix.c 2010-09-21 22:09:28.000000000 +0200 |
| 18 | --- src/os_unix.c 2010-10-13 16:17:33.000000000 +0200 |
| 19 | *************** |
| 20 | *** 4168,4174 **** |
| 21 | # ifdef FEAT_GUI |
| 22 | if (pty_master_fd >= 0) |
| 23 | { |
| 24 | - close(pty_slave_fd); /* close slave side of pty */ |
| 25 | fromshell_fd = pty_master_fd; |
| 26 | toshell_fd = dup(pty_master_fd); |
| 27 | } |
| 28 | --- 4168,4173 ---- |
| 29 | *************** |
| 30 | *** 4637,4642 **** |
| 31 | --- 4636,4649 ---- |
| 32 | break; |
| 33 | } |
| 34 | |
| 35 | + # ifdef FEAT_GUI |
| 36 | + /* Close slave side of pty. Only do this after the child has |
| 37 | + * exited, otherwise the child may hang when it tries to write on |
| 38 | + * the pty. */ |
| 39 | + if (pty_master_fd >= 0) |
| 40 | + close(pty_slave_fd); |
| 41 | + # endif |
| 42 | + |
| 43 | /* Make sure the child that writes to the external program is |
| 44 | * dead. */ |
| 45 | if (wpid > 0) |
| 46 | *** ../vim-7.3.022/src/version.c 2010-10-13 14:05:29.000000000 +0200 |
| 47 | --- src/version.c 2010-10-13 16:20:48.000000000 +0200 |
| 48 | *************** |
| 49 | *** 716,717 **** |
| 50 | --- 716,719 ---- |
| 51 | { /* Add new patch number below this line */ |
| 52 | + /**/ |
| 53 | + 23, |
| 54 | /**/ |
| 55 | |
| 56 | -- |
| 57 | We're knights of the Round Table |
| 58 | Our shows are formidable |
| 59 | But many times |
| 60 | We're given rhymes |
| 61 | That are quite unsingable |
| 62 | We're opera mad in Camelot |
| 63 | We sing from the diaphragm a lot. |
| 64 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD |
| 65 | |
| 66 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ |
| 67 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
| 68 | \\\ download, build and distribute -- http://www.A-A-P.org /// |
| 69 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |
projects / packages / vim.git / blame