X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Facl_entries.c;h=2bf8adc25d56e5f7be1d0f7cb8a6e9f02c6e63eb;hb=0ba19fcc5ff43167939e465af4b93f965fffcc8c;hp=7884e4739f8e3eb209fbdad789f63215a5208a3c;hpb=cfe421207fa4b6ddd95ed5a3fedec94279db2e0a;p=gnulib.git

diff --git a/lib/acl_entries.c b/lib/acl_entries.c
index 7884e4739..2bf8adc25 100644
--- 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-2009 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2011 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
@@ -35,13 +35,29 @@ acl_entries (acl_t acl)
   if (acl != NULL)
     {
 #if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, MacOS X */
+# if HAVE_ACL_TYPE_EXTENDED /* MacOS 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.  */
@@ -49,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