mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-01 15:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4740 from brcolow/vim-7.4.1276

Browse Source 
vim-patch:7.4.1276
This commit is contained in:
Justin M. Keyes
2016-05-29 00:05:49 -04:00
parent 1e70ebe849 cf29b4025d
commit ecbc9dbdfe
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/fileio.c
View File

@@ -1749,8 +1749,9 @@ failed:
#ifdef HAVE_FD_CLOEXEC #ifdef HAVE_FD_CLOEXEC
else { else {
int fdflags = fcntl(fd, F_GETFD); int fdflags = fcntl(fd, F_GETFD);
if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) {
fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC); (void)fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC);
}
} }
#endif #endif
xfree(buffer); xfree(buffer);

2
src/nvim/memfile.c
View File

@@ -913,7 +913,7 @@ static bool mf_do_open(memfile_T *mfp, char_u *fname, int flags)
#ifdef HAVE_FD_CLOEXEC #ifdef HAVE_FD_CLOEXEC
int fdflags = fcntl(mfp->mf_fd, F_GETFD); int fdflags = fcntl(mfp->mf_fd, F_GETFD);
if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) { if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) {
fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC); (void)fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
} }
#endif #endif
#ifdef HAVE_SELINUX #ifdef HAVE_SELINUX

5
src/nvim/memline.c
View File

@@ -443,8 +443,9 @@ void ml_setname(buf_T *buf)
#ifdef HAVE_FD_CLOEXEC #ifdef HAVE_FD_CLOEXEC
{ {
int fdflags = fcntl(mfp->mf_fd, F_GETFD); int fdflags = fcntl(mfp->mf_fd, F_GETFD);
if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) {
fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC); (void)fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
}
} }
#endif #endif
} }

2
src/nvim/version.c
View File

@@ -416,7 +416,7 @@ static int included_patches[] = {
// 1279 NA // 1279 NA
// 1278 NA // 1278 NA
// 1277 NA // 1277 NA
// 1276, 1276,
// 1275 NA // 1275 NA
// 1274 NA // 1274 NA
// 1273, // 1273,