projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 12c15a4c AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.3.067 | |
| 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 6.3.067 (after 6.3.066) | |
| 11 | Problem: Newly created file gets execute permission. | |
| 12 | Solution: Check for "perm" to be negative before using it. | |
| 13 | Files: src/fileio.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-6.3.030/src/fileio.c Fri Mar 18 13:37:34 2005 | |
| 17 | --- src/fileio.c Fri Mar 18 19:16:29 2005 | |
| 18 | *************** | |
| 19 | *** 3698,3704 **** | |
| 20 | while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append | |
| 21 | ? (forceit ? (O_APPEND | O_CREAT) : O_APPEND) | |
| 22 | : (O_CREAT | O_TRUNC)) | |
| 23 | ! , perm & 0777)) < 0) | |
| 24 | { | |
| 25 | /* | |
| 26 | * A forced write will try to create a new file if the old one is | |
| 27 | --- 3698,3704 ---- | |
| 28 | while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append | |
| 29 | ? (forceit ? (O_APPEND | O_CREAT) : O_APPEND) | |
| 30 | : (O_CREAT | O_TRUNC)) | |
| 31 | ! , perm < 0 ? 0666 : (perm & 0777))) < 0) | |
| 32 | { | |
| 33 | /* | |
| 34 | * A forced write will try to create a new file if the old one is | |
| 35 | *************** | |
| 36 | *** 4262,4268 **** | |
| 37 | ||
| 38 | if (org == NULL | |
| 39 | || (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL, | |
| 40 | ! perm & 0777)) < 0) | |
| 41 | EMSG(_("E206: patchmode: can't touch empty original file")); | |
| 42 | else | |
| 43 | close(empty_fd); | |
| 44 | --- 4262,4268 ---- | |
| 45 | ||
| 46 | if (org == NULL | |
| 47 | || (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL, | |
| 48 | ! perm < 0 ? 0666 : (perm & 0777))) < 0) | |
| 49 | EMSG(_("E206: patchmode: can't touch empty original file")); | |
| 50 | else | |
| 51 | close(empty_fd); | |
| 52 | *** ../vim-6.3.030/src/version.c Fri Mar 18 13:37:34 2005 | |
| 53 | --- src/version.c Fri Mar 18 19:17:45 2005 | |
| 54 | *************** | |
| 55 | *** 643,644 **** | |
| 56 | --- 643,646 ---- | |
| 57 | { /* Add new patch number below this line */ | |
| 58 | + /**/ | |
| 59 | + 67, | |
| 60 | /**/ | |
| 61 | ||
| 62 | -- | |
| 63 | If corn oil comes from corn, where does baby oil come from? | |
| 64 | ||
| 65 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 66 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 67 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 68 | \\\ Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html /// |