aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.2.338

Browse Source 
Problem:    Part of FD_CLOEXEC change is missing.
Solution:   Include source file skipped because of typo.
This commit is contained in:
Bram Moolenaar 2010-01-19 16:22:03 +01:00
parent 3d63e3f160
commit 6b29b0e809
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/ex_cmds2.c
View File

@ -2802,20 +2802,35 @@ source_level(cookie)
static char_u *get_one_sourceline __ARGS((struct source_cookie *sp)); static char_u *get_one_sourceline __ARGS((struct source_cookie *sp));
#if defined(WIN32) && defined(FEAT_CSCOPE) #if (defined(WIN32) && defined(FEAT_CSCOPE)) || defined(HAVE_FD_CLOEXEC)
# define USE_FOPEN_NOINH
static FILE *fopen_noinh_readbin __ARGS((char *filename)); static FILE *fopen_noinh_readbin __ARGS((char *filename));
/* /*
* Special function to open a file without handle inheritance. * Special function to open a file without handle inheritance.
* When possible the handle is closed on exec().
*/ */
static FILE * static FILE *
fopen_noinh_readbin(filename) fopen_noinh_readbin(filename)
char *filename; char *filename;
{ {
int fd_tmp = mch_open(filename, O_RDONLY | O_BINARY | O_NOINHERIT, 0); int fd_tmp = mch_open(filename, O_RDONLY
# ifdef WIN32
O_BINARY | O_NOINHERIT
# endif
, 0);
if (fd_tmp == -1) if (fd_tmp == -1)
return NULL; return NULL;
# ifdef HAVE_FD_CLOEXEC
{
int fdflags = fcntl(fd_tmp, F_GETFD);
if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
fcntl(fd_tmp, F_SETFD, fdflags | FD_CLOEXEC);
}
# endif
return fdopen(fd_tmp, READBIN); return fdopen(fd_tmp, READBIN);
} }
#endif #endif
@ -2895,7 +2910,7 @@ do_source(fname, check_other, is_vimrc)
apply_autocmds(EVENT_SOURCEPRE, fname_exp, fname_exp, FALSE, curbuf); apply_autocmds(EVENT_SOURCEPRE, fname_exp, fname_exp, FALSE, curbuf);
#endif #endif
#if defined(WIN32) && defined(FEAT_CSCOPE) #ifdef USE_FOPEN_NOINH
cookie.fp = fopen_noinh_readbin((char *)fname_exp); cookie.fp = fopen_noinh_readbin((char *)fname_exp);
#else #else
cookie.fp = mch_fopen((char *)fname_exp, READBIN); cookie.fp = mch_fopen((char *)fname_exp, READBIN);
@ -2916,7 +2931,7 @@ do_source(fname, check_other, is_vimrc)
*p = '.'; *p = '.';
else else
*p = '_'; *p = '_';
#if defined(WIN32) && defined(FEAT_CSCOPE) #ifdef USE_FOPEN_NOINH
cookie.fp = fopen_noinh_readbin((char *)fname_exp); cookie.fp = fopen_noinh_readbin((char *)fname_exp);
#else #else
cookie.fp = mch_fopen((char *)fname_exp, READBIN); cookie.fp = mch_fopen((char *)fname_exp, READBIN);

2
src/version.c
View File

@ -681,6 +681,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
338,
/**/ /**/
337, 337,
/**/ /**/