Mercurial > emacs
changeset 16534:21aae8d73ddd
(USG5 or BSD_SYSTEM or LINUX): Include fcntl.h.
(Ffile_readable_p): Return immediately if stat fails.
Call S_ISFIFO correctly.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Thu, 07 Nov 1996 06:07:00 +0000 |
| parents | aa23842d0e1a |
| children | d5eeca7cdaf2 |
| files | src/fileio.c |
| diffstat | 1 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fileio.c Thu Nov 07 05:59:43 1996 +0000 +++ b/src/fileio.c Thu Nov 07 06:07:00 1996 +0000 @@ -20,6 +20,10 @@ #include <config.h> +#if defined (USG5) || defined (BSD_SYSTEM) || defined (LINUX) +#include <fcntl.h> +#endif + #include <sys/types.h> #include <sys/stat.h> @@ -31,6 +35,10 @@ # define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) #endif +#if !defined (S_ISFIFO) && defined (S_IFIFO) +# define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) +#endif + #if !defined (S_ISREG) && defined (S_IFREG) # define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) #endif @@ -2616,6 +2624,8 @@ Lisp_Object absname; Lisp_Object handler; int desc; + int flags; + struct stat statbuf; CHECK_STRING (filename, 0); absname = Fexpand_file_name (filename, Qnil); @@ -2632,7 +2642,18 @@ return Qt; return Qnil; #else /* not DOS_NT */ - desc = open (XSTRING (absname)->data, O_RDONLY); + flags = O_RDONLY; +#if defined (S_ISFIFO) && defined (O_NONBLOCK) + /* Opening a fifo without O_NONBLOCK can wait. + We don't want to wait. But we don't want to mess wth O_NONBLOCK + except in the case of a fifo, on a system which handles it. */ + desc = stat (XSTRING (absname)->data, &statbuf); + if (desc < 0) + return Qnil; + if (S_ISFIFO (statbuf.st_mode)) + flags |= O_NONBLOCK; +#endif + desc = open (XSTRING (absname)->data, flags); if (desc < 0) return Qnil; close (desc);