13 files changed, 137 insertions, 132 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ee18650e992..5a1b4a5d8ee 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,32 +1,3 @@
-2012-10-19  Paul Eggert  <eggert@cs.ucla.edu>
-
-        Use faccessat, not access, when checking file permissions (Bug#12632).
-        * Makefile.in (LIB_EACCESS): New macro.
-        (LIBES): Use it.
-        * callproc.c (init_callproc):
-        * charset.c (init_charset):
-        * fileio.c (check_existing, check_executable):
-        * lread.c (openp, load_path_check):
-        * process.c (allocate_pty):
-        * xrdb.c (file_p):
-        Use faccessat, not access or euidaccess.  Use symbolic names
-        instead of integers for the flags, as they're portable now.
-        * charset.c, xrdb.c: Include <fcntl.h>, for the new flags used.
-        * fileio.c (Ffile_readable_p):
-        Use faccessat, not stat + open + close.
-        (file_directory_p): New function, which uses 'stat' on most places
-        but 'access' (for efficiency) if WINDOWSNT.
-        * fileio.c (Ffile_directory_p, Fset_file_times):
-        * xrdb.c (file_p): Use file_directory_p.
-        * lisp.h (file_directory_p): New decl.
-        * lread.c (openp): When opening a file, use fstat rather than
-        stat, as that avoids a permissions race.  When not opening a file,
-        use file_directory_p rather than stat.
-        * process.c, sysdep.c, term.c: All uses of '#ifdef O_NONBLOCK'
-        changed to '#if O_NONBLOCK', to accommodate gnulib O_* style.
-        * w32.c (sys_faccessat): Rename from sys_access and switch to
-        faccessat's API.  All uses changed.
-
 2012-10-19  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)
 
         * font.c (Ffont_at): Fix previous change.
diff --git a/src/Makefile.in b/src/Makefile.in
index d034ad04796..c24e421bbbc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -150,7 +150,6 @@ M17N_FLT_CFLAGS = @M17N_FLT_CFLAGS@
 M17N_FLT_LIBS = @M17N_FLT_LIBS@
 
 LIB_CLOCK_GETTIME=@LIB_CLOCK_GETTIME@
-LIB_EACCESS=@LIB_EACCESS@
 LIB_TIMER_TIME=@LIB_TIMER_TIME@
 
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -393,7 +392,7 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \
 LIBES = $(LIBS) $(W32_LIBS) $(LIBX_BASE) $(LIBIMAGE) \
    $(LIBX_OTHER) $(LIBSOUND) \
    $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) \
-   $(LIB_EACCESS) $(LIB_TIMER_TIME) $(DBUS_LIBS) \
+   $(LIB_TIMER_TIME) $(DBUS_LIBS) \
    $(LIB_EXECINFO) \
    $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
    $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
diff --git a/src/callproc.c b/src/callproc.c
index 5a9b32f08c3..b33882e54c2 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1597,13 +1597,13 @@ init_callproc (void)
 #endif
     {
       tempdir = Fdirectory_file_name (Vexec_directory);
-      if (faccessat (AT_FDCWD, SSDATA (tempdir), F_OK, AT_EACCESS) != 0)
+      if (access (SSDATA (tempdir), 0) < 0)
         dir_warning ("Warning: arch-dependent data dir (%s) does not exist.\n",
                      Vexec_directory);
     }
 
   tempdir = Fdirectory_file_name (Vdata_directory);
-  if (faccessat (AT_FDCWD, SSDATA (tempdir), F_OK, AT_EACCESS) != 0)
+  if (access (SSDATA (tempdir), 0) < 0)
     dir_warning ("Warning: arch-independent data dir (%s) does not exist.\n",
                  Vdata_directory);
 
diff --git a/src/charset.c b/src/charset.c
index fe068e1d3bc..6b999824dab 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -28,7 +28,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define CHARSET_INLINE EXTERN_INLINE
 
-#include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <limits.h>
@@ -2294,7 +2293,7 @@ init_charset (void)
 {
   Lisp_Object tempdir;
   tempdir = Fexpand_file_name (build_string ("charsets"), Vdata_directory);
-  if (faccessat (AT_FDCWD, SSDATA (tempdir), F_OK, AT_EACCESS) != 0)
+  if (access (SSDATA (tempdir), 0) < 0)
     {
       /* This used to be non-fatal (dir_warning), but it should not
          happen, and if it does sooner or later it will cause some
diff --git a/src/conf_post.h b/src/conf_post.h
index eade536e6e1..aa008107ba6 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -169,10 +169,6 @@ extern void _DebPrint (const char *fmt, ...);
 #endif
 #endif
 
-/* Tell gnulib to omit support for openat-related functions having a
-   first argument other than AT_FDCWD.  */
-#define GNULIB_SUPPORT_ONLY_AT_FDCWD
-
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/src/fileio.c b/src/fileio.c
index 3accb58a3eb..d47d7dd9e0b 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2425,7 +2425,15 @@ On Unix, this is a name starting with a `/' or a `~'.  */)
 bool
 check_existing (const char *filename)
 {
-  return faccessat (AT_FDCWD, filename, F_OK, AT_EACCESS) == 0;
+#ifdef DOS_NT
+  /* The full emulation of Posix 'stat' is too expensive on
+     DOS/Windows, when all we want to know is whether the file exists.
+     So we use 'access' instead, which is much more lightweight.  */
+  return (access (filename, F_OK) >= 0);
+#else
+  struct stat st;
+  return (stat (filename, &st) >= 0);
+#endif
 }
 
 /* Return true if file FILENAME exists and can be executed.  */
@@ -2433,7 +2441,21 @@ check_existing (const char *filename)
 static bool
 check_executable (char *filename)
 {
-  return faccessat (AT_FDCWD, filename, X_OK, AT_EACCESS) == 0;
+#ifdef DOS_NT
+  struct stat st;
+  if (stat (filename, &st) < 0)
+    return 0;
+  return ((st.st_mode & S_IEXEC) != 0);
+#else /* not DOS_NT */
+#ifdef HAVE_EUIDACCESS
+  return (euidaccess (filename, 1) >= 0);
+#else
+  /* Access isn't quite right because it uses the real uid
+     and we really want to test with the effective uid.
+     But Unix doesn't give us a right way to do it.  */
+  return (access (filename, 1) >= 0);
+#endif
+#endif /* not DOS_NT */
 }
 
 /* Return true if file FILENAME exists and can be written.  */
@@ -2442,16 +2464,15 @@ static bool
 check_writable (const char *filename)
 {
 #ifdef MSDOS
-  /* FIXME: an faccessat implementation should be added to the
-     DOS/Windows ports and this #ifdef branch should be removed.  */
   struct stat st;
   if (stat (filename, &st) < 0)
     return 0;
   return (st.st_mode & S_IWRITE || S_ISDIR (st.st_mode));
 #else /* not MSDOS */
-  bool res = faccessat (AT_FDCWD, filename, W_OK, AT_EACCESS) == 0;
+#ifdef HAVE_EUIDACCESS
+  bool res = (euidaccess (filename, 2) >= 0);
 #ifdef CYGWIN
-  /* faccessat may have returned failure because Cygwin couldn't
+  /* euidaccess may have returned failure because Cygwin couldn't
      determine the file's UID or GID; if so, we return success. */
   if (!res)
     {
@@ -2462,6 +2483,14 @@ check_writable (const char *filename)
     }
 #endif /* CYGWIN */
   return res;
+#else /* not HAVE_EUIDACCESS */
+  /* Access isn't quite right because it uses the real uid
+     and we really want to test with the effective uid.
+     But Unix doesn't give us a right way to do it.
+     Opening with O_WRONLY could work for an ordinary file,
+     but would lose for directories.  */
+  return (access (filename, 2) >= 0);
+#endif /* not HAVE_EUIDACCESS */
 #endif /* not MSDOS */
 }
 
@@ -2518,6 +2547,9 @@ See also `file-exists-p' and `file-attributes'.  */)
 {
   Lisp_Object absname;
   Lisp_Object handler;
+  int desc;
+  int flags;
+  struct stat statbuf;
 
   CHECK_STRING (filename);
   absname = Fexpand_file_name (filename, Qnil);
@@ -2529,8 +2561,31 @@ See also `file-exists-p' and `file-attributes'.  */)
     return call2 (handler, Qfile_readable_p, absname);
 
   absname = ENCODE_FILE (absname);
-  return (faccessat (AT_FDCWD, SSDATA (absname), R_OK, AT_EACCESS) == 0
-          ? Qt : Qnil);
+
+#if defined (DOS_NT) || defined (macintosh)
+  /* Under MS-DOS, Windows, and Macintosh, open does not work for
+     directories.  */
+  if (access (SDATA (absname), 0) == 0)
+    return Qt;
+  return Qnil;
+#else /* not DOS_NT and not macintosh */
+  flags = O_RDONLY;
+#ifdef 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 (SSDATA (absname), &statbuf);
+  if (desc < 0)
+    return Qnil;
+  if (S_ISFIFO (statbuf.st_mode))
+    flags |= O_NONBLOCK;
+#endif
+  desc = emacs_open (SSDATA (absname), flags, 0);
+  if (desc < 0)
+    return Qnil;
+  emacs_close (desc);
+  return Qt;
+#endif /* not DOS_NT and not macintosh */
 }
 
 /* Having this before file-symlink-p mysteriously caused it to be forgotten
@@ -2567,7 +2622,7 @@ DEFUN ("file-writable-p", Ffile_writable_p, Sfile_writable_p, 1, 1, 0,
   /* The read-only attribute of the parent directory doesn't affect
      whether a file or directory can be created within it.  Some day we
      should check ACLs though, which do affect this.  */
-  return file_directory_p (SDATA (dir)) ? Qt : Qnil;
+  return (access (SDATA (dir), D_OK) < 0) ? Qnil : Qt;
 #else
   return (check_writable (!NILP (dir) ? SSDATA (dir) : "")
           ? Qt : Qnil);
@@ -2648,7 +2703,8 @@ Symbolic links to directories count as directories.
 See `file-symlink-p' to distinguish symlinks.  */)
   (Lisp_Object filename)
 {
-  Lisp_Object absname;
+  register Lisp_Object absname;
+  struct stat st;
   Lisp_Object handler;
 
   absname = expand_and_dir_to_file (filename, BVAR (current_buffer, directory));
@@ -2661,20 +2717,9 @@ See `file-symlink-p' to distinguish symlinks.  */)
 
   absname = ENCODE_FILE (absname);
 
-  return file_directory_p (SSDATA (absname)) ? Qt : Qnil;
-}
-
-/* Return true if FILE is a directory or a symlink to a directory.  */
-bool
-file_directory_p (char const *file)
-{
-#ifdef WINDOWSNT
-  /* This is cheaper than 'stat'.  */
-  return faccessat (AT_FDCWD, file, D_OK, AT_EACCESS) == 0;
-#else
-  struct stat st;
-  return stat (file, &st) == 0 && S_ISDIR (st.st_mode);
-#endif
+  if (stat (SSDATA (absname), &st) < 0)
+    return Qnil;
+  return S_ISDIR (st.st_mode) ? Qt : Qnil;
 }
 
 DEFUN ("file-accessible-directory-p", Ffile_accessible_directory_p,
@@ -2999,8 +3044,10 @@ Use the current time if TIMESTAMP is nil.  TIMESTAMP is in the format of
     if (set_file_times (-1, SSDATA (encoded_absname), t, t))
       {
 #ifdef MSDOS
+        struct stat st;
+
         /* Setting times on a directory always fails.  */
-        if (file_directory_p (SSDATA (encoded_absname)))
+        if (stat (SSDATA (encoded_absname), &st) == 0 && S_ISDIR (st.st_mode))
           return Qnil;
 #endif
         report_file_error ("Setting file times", Fcons (absname, Qnil));
diff --git a/src/lisp.h b/src/lisp.h
index 897757cf462..01f6ca5e57c 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3178,7 +3178,6 @@ extern Lisp_Object close_file_unwind (Lisp_Object);
 extern Lisp_Object restore_point_unwind (Lisp_Object);
 extern _Noreturn void report_file_error (const char *, Lisp_Object);
 extern void internal_delete_file (Lisp_Object);
-extern bool file_directory_p (const char *);
 extern void syms_of_fileio (void);
 extern Lisp_Object make_temp_name (Lisp_Object, bool);
 extern Lisp_Object Qdelete_file;
diff --git a/src/lread.c b/src/lread.c
index dedce50de2a..6d4c0d990af 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1404,7 +1404,7 @@ Returns the file's name in absolute form, or nil if not found.
 If SUFFIXES is non-nil, it should be a list of suffixes to append to
 file name when searching.
 If non-nil, PREDICATE is used instead of `file-readable-p'.
-PREDICATE can also be an integer to pass to the faccessat(2) function,
+PREDICATE can also be an integer to pass to the access(2) function,
 in which case file-name-handlers are ignored.
 This function will normally skip directories, so if you want it to find
 directories, make sure the PREDICATE function returns `dir-ok' for them.  */)
@@ -1442,6 +1442,7 @@ static Lisp_Object Qdir_ok;
 int
 openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes, Lisp_Object *storeptr, Lisp_Object predicate)
 {
+  int fd;
   ptrdiff_t fn_size = 100;
   char buf[100];
   char *fn = buf;
@@ -1496,6 +1497,7 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes, Lisp_Object *sto
         {
           ptrdiff_t fnlen, lsuffix = SBYTES (XCAR (tail));
           Lisp_Object handler;
+          bool exists;
 
           /* Concatenate path element/specified name with the suffix.
              If the directory starts with /:, remove that.  */
@@ -1519,7 +1521,6 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes, Lisp_Object *sto
           handler = Ffind_file_name_handler (string, Qfile_exists_p);
           if ((!NILP (handler) || !NILP (predicate)) && !NATNUMP (predicate))
             {
-              bool exists;
               if (NILP (predicate))
                 exists = !NILP (Ffile_readable_p (string));
               else
@@ -1541,40 +1542,37 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes, Lisp_Object *sto
             }
           else
             {
-              int fd;
+#ifndef WINDOWSNT
+              struct stat st;
+#endif
               const char *pfn;
 
               encoded_fn = ENCODE_FILE (string);
               pfn = SSDATA (encoded_fn);
-
-              /* Check that we can access or open it.  */
-              if (NATNUMP (predicate))
-                fd = (((XFASTINT (predicate) & ~INT_MAX) == 0
-                       && (faccessat (AT_FDCWD, pfn, XFASTINT (predicate),
-                                      AT_EACCESS)
-                           == 0)
-                       && ! file_directory_p (pfn))
-                      ? 1 : -1);
-              else
+#ifdef WINDOWSNT
+              exists = access (pfn, F_OK) == 0 && access (pfn, D_OK) < 0;
+#else
+              exists = (stat (pfn, &st) == 0 && ! S_ISDIR (st.st_mode));
+#endif
+              if (exists)
                 {
-                  struct stat st;
-                  fd = emacs_open (pfn, O_RDONLY, 0);
-                  if (0 <= fd
-                      && (fstat (fd, &st) != 0 || S_ISDIR (st.st_mode)))
+                  /* Check that we can access or open it.  */
+                  if (NATNUMP (predicate))
+                    fd = (((XFASTINT (predicate) & ~INT_MAX) == 0
+                           && access (pfn, XFASTINT (predicate)) == 0)
+                          ? 1 : -1);
+                  else
+                    fd = emacs_open (pfn, O_RDONLY, 0);
+
+                  if (fd >= 0)
                     {
-                      emacs_close (fd);
-                      fd = -1;
+                      /* We succeeded; return this descriptor and filename.  */
+                      if (storeptr)
+                        *storeptr = string;
+                      UNGCPRO;
+                      return fd;
                     }
                 }
-
-              if (fd >= 0)
-                {
-                  /* We succeeded; return this descriptor and filename.  */
-                  if (storeptr)
-                    *storeptr = string;
-                  UNGCPRO;
-                  return fd;
-                }
             }
         }
       if (absolute)
@@ -4090,7 +4088,7 @@ load_path_check (void)
       if (STRINGP (dirfile))
         {
           dirfile = Fdirectory_file_name (dirfile);
-          if (faccessat (AT_FDCWD, SSDATA (dirfile), F_OK, AT_EACCESS) != 0)
+          if (access (SSDATA (dirfile), 0) < 0)
             dir_warning ("Warning: Lisp directory `%s' does not exist.\n",
                          XCAR (path_tail));
         }
diff --git a/src/process.c b/src/process.c
index 572ab83de09..307e82819d6 100644
--- a/src/process.c
+++ b/src/process.c
@@ -204,7 +204,7 @@ static EMACS_INT update_tick;
 #ifndef NON_BLOCKING_CONNECT
 #ifdef HAVE_SELECT
 #if defined (HAVE_GETPEERNAME) || defined (GNU_LINUX)
-#if O_NONBLOCK || O_NDELAY
+#if defined (O_NONBLOCK) || defined (O_NDELAY)
 #if defined (EWOULDBLOCK) || defined (EINPROGRESS)
 #define NON_BLOCKING_CONNECT
 #endif /* EWOULDBLOCK || EINPROGRESS */
@@ -651,7 +651,7 @@ allocate_pty (void)
         PTY_OPEN;
 #else /* no PTY_OPEN */
         {
-#  if O_NONBLOCK
+#  ifdef O_NONBLOCK
           fd = emacs_open (pty_name, O_RDWR | O_NONBLOCK, 0);
 #  else
           fd = emacs_open (pty_name, O_RDWR | O_NDELAY, 0);
@@ -668,7 +668,7 @@ allocate_pty (void)
 #else
             sprintf (pty_name, "/dev/tty%c%x", c, i);
 #endif /* no PTY_TTY_NAME_SPRINTF */
-            if (faccessat (AT_FDCWD, pty_name, R_OK | W_OK, AT_EACCESS) != 0)
+            if (access (pty_name, 6) != 0)
               {
                 emacs_close (fd);
 # ifndef __sgi
@@ -1621,7 +1621,7 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
 #if ! defined (USG) || defined (USG_SUBTTY_WORKS)
       /* On most USG systems it does not work to open the pty's tty here,
          then close it and reopen it in the child.  */
-#if O_NOCTTY
+#ifdef O_NOCTTY
       /* Don't let this terminal become our controlling terminal
          (in case we don't have one).  */
       forkout = forkin = emacs_open (pty_name, O_RDWR | O_NOCTTY, 0);
@@ -1675,11 +1675,11 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
     }
 #endif
 
-#if O_NONBLOCK
+#ifdef O_NONBLOCK
   fcntl (inchannel, F_SETFL, O_NONBLOCK);
   fcntl (outchannel, F_SETFL, O_NONBLOCK);
 #else
-#if O_NDELAY
+#ifdef O_NDELAY
   fcntl (inchannel, F_SETFL, O_NDELAY);
   fcntl (outchannel, F_SETFL, O_NDELAY);
 #endif
@@ -1967,7 +1967,7 @@ create_pty (Lisp_Object process)
 #if ! defined (USG) || defined (USG_SUBTTY_WORKS)
       /* On most USG systems it does not work to open the pty's tty here,
          then close it and reopen it in the child.  */
-#if O_NOCTTY
+#ifdef O_NOCTTY
       /* Don't let this terminal become our controlling terminal
          (in case we don't have one).  */
       int forkout = emacs_open (pty_name, O_RDWR | O_NOCTTY, 0);
@@ -1987,11 +1987,11 @@ create_pty (Lisp_Object process)
     }
 #endif /* HAVE_PTYS */
 
-#if O_NONBLOCK
+#ifdef O_NONBLOCK
   fcntl (inchannel, F_SETFL, O_NONBLOCK);
   fcntl (outchannel, F_SETFL, O_NONBLOCK);
 #else
-#if O_NDELAY
+#ifdef O_NDELAY
   fcntl (inchannel, F_SETFL, O_NDELAY);
   fcntl (outchannel, F_SETFL, O_NDELAY);
 #endif
@@ -2951,7 +2951,7 @@ usage: (make-network-process &rest ARGS)  */)
     {
       /* Don't support network sockets when non-blocking mode is
          not available, since a blocked Emacs is not useful.  */
-#if !O_NONBLOCK && !O_NDELAY
+#if !defined (O_NONBLOCK) && !defined (O_NDELAY)
       error ("Network servers not supported");
 #else
       is_server = 1;
@@ -3217,7 +3217,7 @@ usage: (make-network-process &rest ARGS)  */)
 #ifdef NON_BLOCKING_CONNECT
       if (is_non_blocking_client)
         {
-#if O_NONBLOCK
+#ifdef O_NONBLOCK
           ret = fcntl (s, F_SETFL, O_NONBLOCK);
 #else
           ret = fcntl (s, F_SETFL, O_NDELAY);
@@ -3434,10 +3434,10 @@ usage: (make-network-process &rest ARGS)  */)
 
   chan_process[inch] = proc;
 
-#if O_NONBLOCK
+#ifdef O_NONBLOCK
   fcntl (inch, F_SETFL, O_NONBLOCK);
 #else
-#if O_NDELAY
+#ifdef O_NDELAY
   fcntl (inch, F_SETFL, O_NDELAY);
 #endif
 #endif
@@ -4169,10 +4169,10 @@ server_accept_connection (Lisp_Object server, int channel)
 
   chan_process[s] = proc;
 
-#if O_NONBLOCK
+#ifdef O_NONBLOCK
   fcntl (s, F_SETFL, O_NONBLOCK);
 #else
-#if O_NDELAY
+#ifdef O_NDELAY
   fcntl (s, F_SETFL, O_NDELAY);
 #endif
 #endif
@@ -4873,11 +4873,11 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
 #endif
               /* ISC 4.1 defines both EWOULDBLOCK and O_NONBLOCK,
                  and Emacs uses O_NONBLOCK, so what we get is EAGAIN.  */
-#if O_NONBLOCK
+#ifdef O_NONBLOCK
               else if (nread == -1 && errno == EAGAIN)
                 ;
 #else
-#if O_NDELAY
+#ifdef O_NDELAY
               else if (nread == -1 && errno == EAGAIN)
                 ;
               /* Note that we cannot distinguish between no input
@@ -7363,7 +7363,7 @@ init_process_emacs (void)
 #ifdef HAVE_GETSOCKNAME
    ADD_SUBFEATURE (QCservice, Qt);
 #endif
-#if O_NONBLOCK || O_NDELAY
+#if defined (O_NONBLOCK) || defined (O_NDELAY)
    ADD_SUBFEATURE (QCserver, Qt);
 #endif
 
diff --git a/src/sysdep.c b/src/sysdep.c
index 8a31957d182..35beeaa7202 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1216,7 +1216,7 @@ reset_sys_modes (struct tty_display_info *tty_out)
              old_fcntl_owner[fileno (tty_out->input)]);
     }
 #endif /* F_SETOWN */
-#if O_NDELAY
+#ifdef O_NDELAY
   fcntl (fileno (tty_out->input), F_SETFL,
          fcntl (fileno (tty_out->input), F_GETFL, 0) & ~O_NDELAY);
 #endif
@@ -2312,12 +2312,12 @@ serial_open (char *port)
 
   fd = emacs_open ((char*) port,
                    O_RDWR
-#if O_NONBLOCK
+#ifdef O_NONBLOCK
                    | O_NONBLOCK
 #else
                    | O_NDELAY
 #endif
-#if O_NOCTTY
+#ifdef O_NOCTTY
                    | O_NOCTTY
 #endif
                    , 0);
diff --git a/src/term.c b/src/term.c
index 87ce5447b76..f7c87b7608d 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3023,7 +3023,7 @@ init_tty (const char *name, const char *terminal_type, int must_succeed)
     int fd;
     FILE *file;
 
-#if O_IGNORE_CTTY
+#ifdef O_IGNORE_CTTY
     if (!ctty)
       /* Open the terminal device.  Don't recognize it as our
          controlling terminal, and don't make it the controlling tty
@@ -3054,7 +3054,7 @@ init_tty (const char *name, const char *terminal_type, int must_succeed)
                      name);
       }
 
-#if !O_IGNORE_CTTY
+#ifndef O_IGNORE_CTTY
     if (!ctty)
       dissociate_if_controlling_tty (fd);
 #endif
diff --git a/src/w32.c b/src/w32.c
index 341f4d3fef3..5ac1bc3eb7c 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -1597,7 +1597,7 @@ init_environment (char ** argv)
          see if it succeeds.  But I think that's too much to ask.  */
 
       /* MSVCRT's _access crashes with D_OK.  */
-      if (tmp && sys_faccessat (AT_FDCWD, tmp, D_OK, AT_EACCESS) == 0)
+      if (tmp && sys_access (tmp, D_OK) == 0)
         {
           char * var = alloca (strlen (tmp) + 8);
           sprintf (var, "TMPDIR=%s", tmp);
@@ -2714,16 +2714,10 @@ logon_network_drive (const char *path)
    long file names.  */
 
 int
-sys_faccessat (int dirfd, const char * path, int mode, int flags)
+sys_access (const char * path, int mode)
 {
   DWORD attributes;
 
-  if (dirfd != AT_FDCWD)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
   /* MSVCRT implementation of 'access' doesn't recognize D_OK, and its
      newer versions blow up when passed D_OK.  */
   path = map_w32_filename (path, NULL);
@@ -2966,7 +2960,7 @@ sys_mktemp (char * template)
         {
           int save_errno = errno;
           p[0] = first_char[i];
-          if (sys_faccessat (AT_FDCWD, template, F_OK, AT_EACCESS) < 0)
+          if (sys_access (template, 0) < 0)
             {
               errno = save_errno;
               return template;
@@ -4017,7 +4011,7 @@ symlink (char const *filename, char const *linkname)
     {
       /* Non-absolute FILENAME is understood as being relative to
          LINKNAME's directory.  We need to prepend that directory to
-         FILENAME to get correct results from sys_faccessat below, since
+         FILENAME to get correct results from sys_access below, since
          otherwise it will interpret FILENAME relative to the
          directory where the Emacs process runs.  Note that
          make-symbolic-link always makes sure LINKNAME is a fully
@@ -4031,10 +4025,10 @@ symlink (char const *filename, char const *linkname)
         strncpy (tem, linkfn, p - linkfn);
       tem[p - linkfn] = '\0';
       strcat (tem, filename);
-      dir_access = sys_faccessat (AT_FDCWD, tem, D_OK, AT_EACCESS);
+      dir_access = sys_access (tem, D_OK);
     }
   else
-    dir_access = sys_faccessat (AT_FDCWD, filename, D_OK, AT_EACCESS);
+    dir_access = sys_access (filename, D_OK);
 
   /* Since Windows distinguishes between symlinks to directories and
      to files, we provide a kludgy feature: if FILENAME doesn't
diff --git a/src/xrdb.c b/src/xrdb.c
index 982a6e46a13..9d056a607e4 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -21,7 +21,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
-#include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
 #include <epaths.h>
@@ -262,8 +261,11 @@ gethomedir (void)
 static int
 file_p (const char *filename)
 {
-  return (faccessat (AT_FDCWD, filename, R_OK, AT_EACCESS) == 0
-          && ! file_directory_p (filename));
+  struct stat status;
+
+  return (access (filename, 4) == 0             /* exists and is readable */
+          && stat (filename, &status) == 0      /* get the status */
+          && (S_ISDIR (status.st_mode)) == 0);  /* not a directory */
 }