projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 21166df1 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.1.281 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.1.281 (after 7.1.279) | |
| 11 | Problem: sa.sa_mask is not initialized. Cscope may not exit. | |
| 12 | Solution: Use sigemptyset(). Use SIGKILL instead of SIGTERM. (Dominique | |
| 13 | Pelle) | |
| 14 | Files: src/if_cscope.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.1.280/src/if_cscope.c Sat Mar 15 12:40:23 2008 | |
| 18 | --- src/if_cscope.c Sun Mar 16 13:05:51 2008 | |
| 19 | *************** | |
| 20 | *** 2136,2142 **** | |
| 21 | # if defined(HAVE_SIGACTION) | |
| 22 | struct sigaction sa, old; | |
| 23 | ||
| 24 | ! /* Use sigaction() to limit the waiting time to two seconds. */ | |
| 25 | sa.sa_handler = sig_handler; | |
| 26 | sa.sa_flags = SA_NODEFER; | |
| 27 | sigaction(SIGALRM, &sa, &old); | |
| 28 | --- 2136,2143 ---- | |
| 29 | # if defined(HAVE_SIGACTION) | |
| 30 | struct sigaction sa, old; | |
| 31 | ||
| 32 | ! /* Use sigaction() to limit the waiting time to two seconds. */ | |
| 33 | ! sigemptyset(&sa.sa_mask); | |
| 34 | sa.sa_handler = sig_handler; | |
| 35 | sa.sa_flags = SA_NODEFER; | |
| 36 | sigaction(SIGALRM, &sa, &old); | |
| 37 | *************** | |
| 38 | *** 2169,2175 **** | |
| 39 | */ | |
| 40 | if (pid < 0 && csinfo[i].pid > 1) | |
| 41 | { | |
| 42 | ! kill(csinfo[i].pid, SIGTERM); | |
| 43 | (void)waitpid(csinfo[i].pid, &pstat, 0); | |
| 44 | } | |
| 45 | } | |
| 46 | --- 2170,2176 ---- | |
| 47 | */ | |
| 48 | if (pid < 0 && csinfo[i].pid > 1) | |
| 49 | { | |
| 50 | ! kill(csinfo[i].pid, SIGKILL); | |
| 51 | (void)waitpid(csinfo[i].pid, &pstat, 0); | |
| 52 | } | |
| 53 | } | |
| 54 | *** ../vim-7.1.280/src/version.c Sat Mar 15 13:10:57 2008 | |
| 55 | --- src/version.c Sun Mar 16 13:08:08 2008 | |
| 56 | *************** | |
| 57 | *** 668,669 **** | |
| 58 | --- 668,671 ---- | |
| 59 | { /* Add new patch number below this line */ | |
| 60 | + /**/ | |
| 61 | + 281, | |
| 62 | /**/ | |
| 63 | ||
| 64 | -- | |
| 65 | hundred-and-one symptoms of being an internet addict: | |
| 66 | 136. You decide to stay in a low-paying job teaching just for the | |
| 67 | free Internet access. | |
| 68 | ||
| 69 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 70 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 71 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 72 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |