* config/srclist.text: Add glibc bug 1248.

[gnulib.git] / lib / acl.c

diff --git a/lib/acl.c b/lib/acl.c
index 74639cc..47b73bd 100644 (file)
--- a/lib/acl.c
+++ b/lib/acl.c
@@ -1,6 +1,6 @@
 /* acl.c - access control lists
 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2005 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
@@ -14,7 +14,7 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
    Written by Paul Eggert.  */
 
@@ -22,6 +22,7 @@
 # include <config.h>
 #endif
 
+#include <sys/types.h>
 #include <sys/stat.h>
 #ifndef S_ISLNK
 # define S_ISLNK(Mode) 0
@@ -38,11 +39,11 @@
 # define MIN_ACL_ENTRIES 4
 #endif
 
-/* Return 1 if PATH has a nontrivial access control list, 0 if not,
+/* Return 1 if FILE has a nontrivial access control list, 0 if not,
    and -1 (setting errno) if an error is encountered.  */
 
 int
-file_has_acl (char const *path, struct stat const *pathstat)
+file_has_acl (char const *file, struct stat const *filestat)
 {
   /* FIXME: This implementation should work on recent-enough versions
      of HP-UX, Solaris, and Unixware, but it simply returns 0 with
@@ -51,9 +52,9 @@ file_has_acl (char const *path, struct stat const *pathstat)
      fix-related ideas.  */
 
 #if HAVE_ACL && defined GETACLCNT
-  if (! S_ISLNK (pathstat->st_mode))
+  if (! S_ISLNK (filestat->st_mode))
     {
-      int n = acl (path, GETACLCNT, 0, NULL);
+      int n = acl (file, GETACLCNT, 0, NULL);
       return n < 0 ? (errno == ENOSYS ? 0 : -1) : (MIN_ACL_ENTRIES < n);
     }
 #endif