X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fchdir-safer.c;h=7c7b0c1c54a94a9edd246bdb3905d7bd34c040f7;hb=e7086a9a301ffcfef17edbcba9e7c0312c33f7a8;hp=f7d657c60f7db9c50474cf1dd618b027de4152dc;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git

diff --git a/lib/chdir-safer.c b/lib/chdir-safer.c
index f7d657c60..7c7b0c1c5 100644
--- a/lib/chdir-safer.c
+++ b/lib/chdir-safer.c
@@ -1,6 +1,6 @@
 /* much like chdir(2), but safer
 
-   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,38 +29,47 @@
 #include <sys/stat.h>
 #include "same-inode.h"
 
+#ifndef HAVE_READLINK
+# define HAVE_READLINK 0
+#endif
+
 /* Like chdir, but fail if DIR is a symbolic link to a directory (or
-   similar funny business), or if DIR is not readable.  This avoids a
-   minor race condition between when a directory is created or statted
-   and when the process chdirs into it.  */
+   similar funny business).  This avoids a minor race condition
+   between when a directory is created or statted and when the process
+   chdirs into it.
+
+   On older systems lacking full support for O_SEARCH, this function
+   can also fail if DIR is not readable.  */
 int
 chdir_no_follow (char const *dir)
 {
   int result = 0;
   int saved_errno;
   int fd = open (dir,
-		 O_RDONLY | O_DIRECTORY | O_NOCTTY | O_NOFOLLOW | O_NONBLOCK);
+                 O_SEARCH | O_DIRECTORY | O_NOCTTY | O_NOFOLLOW | O_NONBLOCK);
   if (fd < 0)
     return -1;
 
   /* If open follows symlinks, lstat DIR and fstat FD to ensure that
      they are the same file; if they are different files, set errno to
      ELOOP (the same value that open uses for symlinks with
-     O_NOFOLLOW) so the caller can report a failure.  */
-  if (! O_NOFOLLOW)
+     O_NOFOLLOW) so the caller can report a failure.
+     Skip this check if HAVE_READLINK == 0, which should be the case
+     on any system that lacks symlink support.  */
+  if (HAVE_READLINK && ! HAVE_WORKING_O_NOFOLLOW)
     {
       struct stat sb1;
       result = lstat (dir, &sb1);
       if (result == 0)
-	{
-	  struct stat sb2;
-	  result = fstat (fd, &sb2);
-	  if (result == 0 && ! SAME_INODE (sb1, sb2))
-	    {
-	      errno = ELOOP;
-	      result = -1;
-	    }
-	}
+        {
+          struct stat sb2;
+          result = fstat (fd, &sb2);
+          if (result == 0 && ! SAME_INODE (sb1, sb2))
+            {
+              errno = ELOOP;
+              result = -1;
+            }
+        }
     }
 
   if (result == 0)