maint: update copyright

[gnulib.git] / lib / acl_entries.c

diff --git a/lib/acl_entries.c b/lib/acl_entries.c
index a931fff..39d6b28 100644 (file)
--- a/lib/acl_entries.c
+++ b/lib/acl_entries.c
@@ -1,6 +1,6 @@
 /* Return the number of entries in an ACL.
 
-   Copyright (C) 2002-2003, 2005-2008 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2014 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
@@ -22,9 +22,10 @@
 #include "acl-internal.h"
 
 /* This file assumes POSIX-draft like ACLs
-   (Linux, FreeBSD, MacOS X, IRIX, Tru64).  */
+   (Linux, FreeBSD, Mac OS X, IRIX, Tru64).  */
 
-/* Return the number of entries in ACL.  */
+/* Return the number of entries in ACL.
+   Return -1 and set errno upon failure to determine it.  */
 
 int
 acl_entries (acl_t acl)
@@ -33,14 +34,30 @@ acl_entries (acl_t acl)
 
   if (acl != NULL)
     {
-#if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, MacOS X */
+#if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, Mac OS X */
+# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
+      /* acl_get_entry returns 0 when it successfully fetches an entry,
+         and -1/EINVAL at the end.  */
       acl_entry_t ace;
-      int at_end;
+      int got_one;
 
-      for (at_end = acl_get_entry (acl, ACL_FIRST_ENTRY, &ace);
-          !at_end;
-          at_end = acl_get_entry (acl, ACL_NEXT_ENTRY, &ace))
-       count++;
+      for (got_one = acl_get_entry (acl, ACL_FIRST_ENTRY, &ace);
+           got_one >= 0;
+           got_one = acl_get_entry (acl, ACL_NEXT_ENTRY, &ace))
+        count++;
+# else /* Linux, FreeBSD */
+      /* acl_get_entry returns 1 when it successfully fetches an entry,
+         and 0 at the end.  */
+      acl_entry_t ace;
+      int got_one;
+
+      for (got_one = acl_get_entry (acl, ACL_FIRST_ENTRY, &ace);
+           got_one > 0;
+           got_one = acl_get_entry (acl, ACL_NEXT_ENTRY, &ace))
+        count++;
+      if (got_one < 0)
+        return -1;
+# endif
 #else /* IRIX, Tru64 */
 # if HAVE_ACL_TO_SHORT_TEXT /* IRIX */
       /* Don't use acl_get_entry: it is undocumented.  */
@@ -48,7 +65,7 @@ acl_entries (acl_t acl)
 # endif
 # if HAVE_ACL_FREE_TEXT /* Tru64 */
       /* Don't use acl_get_entry: it takes only one argument and does not
-        work.  */
+         work.  */
       count = acl->acl_num;
 # endif
 #endif