thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.2229

Browse Source 
Problem:    Startup test fails on Solaris.
Solution:   Recognize a character device. (Danek Duvall)
This commit is contained in:
Bram Moolenaar
2016-08-20 15:05:39 +02:00
parent 9e4d8215d3
commit f04507d132
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/buffer.c
View File

@@ -219,6 +219,9 @@ open_buffer(
# endif # endif
# ifdef S_ISSOCK # ifdef S_ISSOCK
|| S_ISSOCK(perm) || S_ISSOCK(perm)
# endif
# ifdef OPEN_CHR_FILES
|| (S_ISCHR(perm) && is_dev_fd_file(curbuf->b_ffname))
# endif # endif
)) ))
read_fifo = TRUE; read_fifo = TRUE;

8
src/fileio.c
View File

@@ -27,10 +27,6 @@
/* Is there any system that doesn't have access()? */ /* Is there any system that doesn't have access()? */
#define USE_MCH_ACCESS #define USE_MCH_ACCESS
#if (defined(sun) || defined(__FreeBSD__)) && defined(S_ISCHR)
# define OPEN_CHR_FILES
static int is_dev_fd_file(char_u *fname);
#endif
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
static char_u *next_fenc(char_u **pp); static char_u *next_fenc(char_u **pp);
# ifdef FEAT_EVAL # ifdef FEAT_EVAL
@@ -2718,14 +2714,14 @@ failed:
return OK; return OK;
} }
#ifdef OPEN_CHR_FILES #if defined(OPEN_CHR_FILES) || defined(PROTO)
/* /*
* Returns TRUE if the file name argument is of the form "/dev/fd/\d\+", * Returns TRUE if the file name argument is of the form "/dev/fd/\d\+",
* which is the name of files used for process substitution output by * which is the name of files used for process substitution output by
* some shells on some operating systems, e.g., bash on SunOS. * some shells on some operating systems, e.g., bash on SunOS.
* Do not accept "/dev/fd/[012]", opening these may hang Vim. * Do not accept "/dev/fd/[012]", opening these may hang Vim.
*/ */
static int int
is_dev_fd_file(char_u *fname) is_dev_fd_file(char_u *fname)
{ {
return (STRNCMP(fname, "/dev/fd/", 8) == 0 return (STRNCMP(fname, "/dev/fd/", 8) == 0

1
src/proto/fileio.pro
View File

@@ -1,6 +1,7 @@
/* fileio.c */ /* fileio.c */
void filemess(buf_T *buf, char_u *name, char_u *s, int attr); void filemess(buf_T *buf, char_u *name, char_u *s, int attr);
int readfile(char_u *fname, char_u *sfname, linenr_T from, linenr_T lines_to_skip, linenr_T lines_to_read, exarg_T *eap, int flags); int readfile(char_u *fname, char_u *sfname, linenr_T from, linenr_T lines_to_skip, linenr_T lines_to_read, exarg_T *eap, int flags);
int is_dev_fd_file(char_u *fname);
int prep_exarg(exarg_T *eap, buf_T *buf); int prep_exarg(exarg_T *eap, buf_T *buf);
void set_file_options(int set_options, exarg_T *eap); void set_file_options(int set_options, exarg_T *eap);
void set_forced_fenc(exarg_T *eap); void set_forced_fenc(exarg_T *eap);

2
src/version.c
View File

@@ -763,6 +763,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 */
/**/
2229,
/**/ /**/
2228, 2228,
/**/ /**/

4
src/vim.h
View File

@@ -2485,4 +2485,8 @@ typedef enum
#define FNE_INCL_BR 1 /* include [] in name */ #define FNE_INCL_BR 1 /* include [] in name */
#define FNE_CHECK_START 2 /* check name starts with valid character */ #define FNE_CHECK_START 2 /* check name starts with valid character */
#if (defined(sun) || defined(__FreeBSD__)) && defined(S_ISCHR)
# define OPEN_CHR_FILES
#endif
#endif /* VIM__H */ #endif /* VIM__H */