X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Feuidaccess.c;h=ba744d5cf7e23afb247eeed0989ef362a4a24e87;hb=b37182eb01e20e28b78bc65033b01a51c658e2fc;hp=38480866601704740e759daed3a82dbc6c1d63e8;hpb=0632e115747ff96e93330c88f536d7354a7ce507;p=gnulib.git

diff --git a/lib/euidaccess.c b/lib/euidaccess.c
index 384808666..ba744d5cf 100644
--- a/lib/euidaccess.c
+++ b/lib/euidaccess.c
@@ -1,32 +1,31 @@
 /* euidaccess -- check if effective user id can access file
 
-   Copyright (C) 1990, 1991, 1995, 1998, 2000, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1990-1991, 1995, 1998, 2000, 2003-2006, 2008-2010 Free
+   Software Foundation, Inc.
 
    This file is part of the GNU C Library.
 
-   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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by David MacKenzie and Torbjorn Granlund.
    Adapted for GNU C library by Roland McGrath.  */
 
 #ifndef _LIBC
 # include <config.h>
-# include "euidaccess.h"
 #endif
 
+#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -67,7 +66,6 @@
 #else
 
 # include "group-member.h"
-# include "stat-macros.h"
 
 #endif
 
@@ -80,7 +78,9 @@
 int
 euidaccess (const char *file, int mode)
 {
-#if defined EFF_ONLY_OK
+#if HAVE_FACCESSAT
+  return faccessat (AT_FDCWD, file, mode, AT_EACCESS);
+#elif defined EFF_ONLY_OK
   return access (file, mode | EFF_ONLY_OK);
 #elif defined ACC_SELF
   return accessx (file, mode, ACC_SELF);
@@ -111,18 +111,18 @@ euidaccess (const char *file, int mode)
       int saved_errno;
 
       if (uid != euid)
-	setreuid (euid, uid);
+        setreuid (euid, uid);
       if (gid != egid)
-	setregid (egid, gid);
+        setregid (egid, gid);
 
       result = access (file, mode);
       saved_errno = errno;
 
       /* Restore them.  */
       if (uid != euid)
-	setreuid (uid, euid);
+        setreuid (uid, euid);
       if (gid != egid)
-	setregid (gid, egid);
+        setregid (gid, egid);
 
       errno = saved_errno;
       return result;
@@ -145,7 +145,7 @@ euidaccess (const char *file, int mode)
   /* The super-user can read and write any file, and execute any file
      that anyone can execute.  */
   if (euid == 0 && ((mode & X_OK) == 0
-		    || (stats.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))))
+                    || (stats.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))))
     return 0;
 
   /* Convert the mode to traditional form, clearing any bogus bits.  */
@@ -153,11 +153,11 @@ euidaccess (const char *file, int mode)
     mode &= 7;
   else
     mode = ((mode & R_OK ? 4 : 0)
-	    + (mode & W_OK ? 2 : 0)
-	    + (mode & X_OK ? 1 : 0));
+            + (mode & W_OK ? 2 : 0)
+            + (mode & X_OK ? 1 : 0));
 
   if (mode == 0)
-    return 0;			/* The file exists.  */
+    return 0;                   /* The file exists.  */
 
   /* Convert the file's permission bits to traditional form.  */
   if (S_IRUSR == (4 << 6) && S_IWUSR == (2 << 6) && S_IXUSR == (1 << 6)
@@ -166,14 +166,14 @@ euidaccess (const char *file, int mode)
     granted = stats.st_mode;
   else
     granted = ((stats.st_mode & S_IRUSR ? 4 << 6 : 0)
-	       + (stats.st_mode & S_IWUSR ? 2 << 6 : 0)
-	       + (stats.st_mode & S_IXUSR ? 1 << 6 : 0)
-	       + (stats.st_mode & S_IRGRP ? 4 << 3 : 0)
-	       + (stats.st_mode & S_IWGRP ? 2 << 3 : 0)
-	       + (stats.st_mode & S_IXGRP ? 1 << 3 : 0)
-	       + (stats.st_mode & S_IROTH ? 4 << 0 : 0)
-	       + (stats.st_mode & S_IWOTH ? 2 << 0 : 0)
-	       + (stats.st_mode & S_IXOTH ? 1 << 0 : 0));
+               + (stats.st_mode & S_IWUSR ? 2 << 6 : 0)
+               + (stats.st_mode & S_IXUSR ? 1 << 6 : 0)
+               + (stats.st_mode & S_IRGRP ? 4 << 3 : 0)
+               + (stats.st_mode & S_IWGRP ? 2 << 3 : 0)
+               + (stats.st_mode & S_IXGRP ? 1 << 3 : 0)
+               + (stats.st_mode & S_IROTH ? 4 << 0 : 0)
+               + (stats.st_mode & S_IWOTH ? 2 << 0 : 0)
+               + (stats.st_mode & S_IXOTH ? 1 << 0 : 0));
 
   if (euid == stats.st_uid)
     granted >>= 6;