X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fchdir-safer.c;h=03f372050f9decc43e326e406d7f9aa3af0b5821;hb=2217763ff0775fa8093a26acfc1b51b726bb358a;hp=5c313bcab9eb3829f8f2121e32701a249e3eb74a;hpb=79c0a43808d9ca85acd04600149fc1a9b75bd1b9;p=gnulib.git

diff --git a/lib/chdir-safer.c b/lib/chdir-safer.c
index 5c313bcab..03f372050 100644
--- a/lib/chdir-safer.c
+++ b/lib/chdir-safer.c
@@ -1,11 +1,11 @@
 /* much like chdir(2), but safer
 
-   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,14 +13,11 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "chdir-safer.h"
 
@@ -32,12 +29,8 @@
 #include <sys/stat.h>
 #include "same-inode.h"
 
-#ifndef O_DIRECTORY
-# define O_DIRECTORY 0
-#endif
-
-#ifndef O_NOFOLLOW
-# define O_NOFOLLOW 0
+#ifndef ELOOP
+# define ELOOP 0
 #endif
 
 /* Like chdir, but fail if DIR is a symbolic link to a directory (or
@@ -57,8 +50,10 @@ chdir_no_follow (char const *dir)
   /* 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 ELOOP == 0, which should be the case
+     on any system that lacks symlink support.  */
+  if (ELOOP && ! HAVE_WORKING_O_NOFOLLOW)
     {
       struct stat sb1;
       result = lstat (dir, &sb1);