2001-08-24 Andrew Choi <akochoi@cse.cuhk.edu.hk>

	* fileio.c (Ffile_readable_p) [macintosh]: Call access instead of
	open to determine whether file is readable (as for DOS_NT).

diff --git a/src/ChangeLog b/src/ChangeLog
index 3ea6c330291cae48bff01d1d27f19baccdc81c29..18e0ce0b93b5bb79f5e41518b3cc4928dbee7ccd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-24  Andrew Choi  <akochoi@cse.cuhk.edu.hk>
+
+       * fileio.c (Ffile_readable_p) [macintosh]: Call access instead of
+       open to determine whether file is readable (as for DOS_NT).
+
 2001-08-23  Gerd Moellmann  <gerd@gnu.org>
 
        * fileio.c (Finsert_file_contents): If VISIT is non-nil, and
@@ -282,7 +287,7 @@
        * coding.c (setup_coding_system): Don't do any designation based
        on reg_bits if charset is not yet defined.
 
-       * lisp.h (XVECTOR): Verify correct object type before returning a
+       * lisp.h (XVECTOR): Verify correct object type before returning a
        pointer, using eassert.
 
 2001-07-17  Gerd Moellmann  <gerd@gnu.org>

diff --git a/src/fileio.c b/src/fileio.c
index 271cee1a4f0fa5a9d0e359b3b5d86d4b154d2742..0b33668ab5de3c2cb772efebe382291db1a769ad 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2967,12 +2967,13 @@ See also `file-exists-p' and `file-attributes'.")
 
   absname = ENCODE_FILE (absname);
 
-#ifdef DOS_NT
-  /* Under MS-DOS and Windows, open does not work for directories.  */
+#if defined(DOS_NT) || defined(macintosh)
+  /* Under MS-DOS, Windows, and Macintosh, open does not work for
+     directories.  */
   if (access (XSTRING (absname)->data, 0) == 0)
     return Qt;
   return Qnil;
-#else /* not DOS_NT */
+#else /* not DOS_NT and not macintosh */
   flags = O_RDONLY;
 #if defined (S_ISFIFO) && defined (O_NONBLOCK)
   /* Opening a fifo without O_NONBLOCK can wait.
@@ -2989,7 +2990,7 @@ See also `file-exists-p' and `file-attributes'.")
     return Qnil;
   emacs_close (desc);
   return Qt;
-#endif /* not DOS_NT */
+#endif /* not DOS_NT and not macintosh */
 }
 
 /* Having this before file-symlink-p mysteriously caused it to be forgotten