summaryrefslogtreecommitdiff
path: root/src/fileio.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-20 15:05:39 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-20 15:05:39 +0200
commitf04507d132fbcb63999167ec006fc6e700b5af4f (patch)
treefdbe08b22d341af7c2178126f8b32bcae5d16c5c /src/fileio.c
parent9e4d8215d386100ab660d7d11e6620fd148b605e (diff)
downloadvim-git-f04507d132fbcb63999167ec006fc6e700b5af4f.tar.gz
patch 7.4.2229v7.4.2229
Problem: Startup test fails on Solaris. Solution: Recognize a character device. (Danek Duvall)
Diffstat (limited to 'src/fileio.c')
-rw-r--r--src/fileio.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 3c3d54835..5e53feef4 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -27,10 +27,6 @@
/* Is there any system that doesn't have 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
static char_u *next_fenc(char_u **pp);
# ifdef FEAT_EVAL
@@ -2718,14 +2714,14 @@ failed:
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\+",
* which is the name of files used for process substitution output by
* some shells on some operating systems, e.g., bash on SunOS.
* Do not accept "/dev/fd/[012]", opening these may hang Vim.
*/
- static int
+ int
is_dev_fd_file(char_u *fname)
{
return (STRNCMP(fname, "/dev/fd/", 8) == 0