projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| b5ccbaa1 ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.179 | |
| 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.2.179 | |
| 11 | Problem: Using negative value for device number might not work. | |
| 12 | Solution: Use a separate flag for whether sn_dev was set. | |
| 13 | Files: src/ex_cmds2.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.178/src/ex_cmds2.c 2009-05-14 22:19:19.000000000 +0200 | |
| 17 | --- src/ex_cmds2.c 2009-05-16 21:13:29.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 28,34 **** | |
| 20 | { | |
| 21 | char_u *sn_name; | |
| 22 | # ifdef UNIX | |
| 23 | ! int sn_dev; | |
| 24 | ino_t sn_ino; | |
| 25 | # endif | |
| 26 | # ifdef FEAT_PROFILE | |
| 27 | --- 28,35 ---- | |
| 28 | { | |
| 29 | char_u *sn_name; | |
| 30 | # ifdef UNIX | |
| 31 | ! int sn_dev_valid; | |
| 32 | ! dev_t sn_dev; | |
| 33 | ino_t sn_ino; | |
| 34 | # endif | |
| 35 | # ifdef FEAT_PROFILE | |
| 36 | *************** | |
| 37 | *** 3049,3055 **** | |
| 38 | /* Compare dev/ino when possible, it catches symbolic | |
| 39 | * links. Also compare file names, the inode may change | |
| 40 | * when the file was edited. */ | |
| 41 | ! ((stat_ok && si->sn_dev != -1) | |
| 42 | && (si->sn_dev == st.st_dev | |
| 43 | && si->sn_ino == st.st_ino)) || | |
| 44 | # endif | |
| 45 | --- 3050,3056 ---- | |
| 46 | /* Compare dev/ino when possible, it catches symbolic | |
| 47 | * links. Also compare file names, the inode may change | |
| 48 | * when the file was edited. */ | |
| 49 | ! ((stat_ok && si->sn_dev_valid) | |
| 50 | && (si->sn_dev == st.st_dev | |
| 51 | && si->sn_ino == st.st_ino)) || | |
| 52 | # endif | |
| 53 | *************** | |
| 54 | *** 3076,3086 **** | |
| 55 | # ifdef UNIX | |
| 56 | if (stat_ok) | |
| 57 | { | |
| 58 | si->sn_dev = st.st_dev; | |
| 59 | si->sn_ino = st.st_ino; | |
| 60 | } | |
| 61 | else | |
| 62 | ! si->sn_dev = -1; | |
| 63 | # endif | |
| 64 | ||
| 65 | /* Allocate the local script variables to use for this script. */ | |
| 66 | --- 3077,3088 ---- | |
| 67 | # ifdef UNIX | |
| 68 | if (stat_ok) | |
| 69 | { | |
| 70 | + si->sn_dev_valid = TRUE; | |
| 71 | si->sn_dev = st.st_dev; | |
| 72 | si->sn_ino = st.st_ino; | |
| 73 | } | |
| 74 | else | |
| 75 | ! si->sn_dev_valid = FALSE; | |
| 76 | # endif | |
| 77 | ||
| 78 | /* Allocate the local script variables to use for this script. */ | |
| 79 | *** ../vim-7.2.178/src/version.c 2009-05-16 21:06:36.000000000 +0200 | |
| 80 | --- src/version.c 2009-05-16 21:15:08.000000000 +0200 | |
| 81 | *************** | |
| 82 | *** 678,679 **** | |
| 83 | --- 678,681 ---- | |
| 84 | { /* Add new patch number below this line */ | |
| 85 | + /**/ | |
| 86 | + 179, | |
| 87 | /**/ | |
| 88 | ||
| 89 | -- | |
| 90 | (letter from Mark to Mike, about the film's probable certificate) | |
| 91 | I would like to get back to the Censor and agree to lose the shits, take | |
| 92 | the odd Jesus Christ out and lose Oh fuck off, but to retain 'fart in | |
| 93 | your general direction', 'castanets of your testicles' and 'oral sex' | |
| 94 | and ask him for an 'A' rating on that basis. | |
| 95 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
| 96 | ||
| 97 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 98 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 99 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 100 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |