Re: add limited support for Solaris 10 ZFS-style ACLs to gnulib

[Paul Eggert]

Eric Blake <address@hidden> writes:

> 2007-03-25  Eric Blake  <address@hidden>
>
>       * lib/acl-internal.h: Remove redundant include.
>       (ACL_NOT_WELL_SUPPORTED): Also filter on EBUSY, returned by
>       Cygwin when a file is locked.

Thanks, I installed that, along with the obvious workaround for
the problem Bruno noted.

2007-03-29  Paul Eggert  <address@hidden>

        * lib/acl-internal.h (acl_get_fd, acl_set_fd): undef before defining,
        to work around a problem on OSF/1 5.1 reported by Bruno Haible.

2007-03-29  Eric Blake  <address@hidden>

        * lib/acl-internal.h: Remove redundant include.
        (ACL_NOT_WELL_SUPPORTED): Also filter on EBUSY, returned by
        Cygwin when a file is locked.

Index: lib/acl-internal.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/acl-internal.h,v
retrieving revision 1.2
diff -u -p -r1.2 acl-internal.h
--- lib/acl-internal.h  20 Mar 2007 05:46:39 -0000      1.2
+++ lib/acl-internal.h  29 Mar 2007 22:50:42 -0000
@@ -18,8 +18,6 @@

    Written by Paul Eggert and Andreas Gruenbacher.  */

-#include <config.h>
-
 #include "acl.h"

 #include <stdbool.h>
@@ -55,12 +53,14 @@
 /* POSIX 1003.1e (draft 17) */
 #ifndef HAVE_ACL_GET_FD
 # define HAVE_ACL_GET_FD false
+# undef acl_get_fd
 # define acl_get_fd(fd) (NULL)
 #endif

 /* POSIX 1003.1e (draft 17) */
 #ifndef HAVE_ACL_SET_FD
 # define HAVE_ACL_SET_FD false
+# undef acl_set_fd
 # define acl_set_fd(fd, acl) (-1)
 #endif

@@ -76,8 +76,8 @@
 # define acl_from_mode(mode) (NULL)
 #endif

-#define ACL_NOT_WELL_SUPPORTED(Errno) \
-  ((Errno) == ENOTSUP || (Errno) == ENOSYS || (Errno) == EINVAL)
+#define ACL_NOT_WELL_SUPPORTED(Err) \
+  ((Err) == ENOTSUP || (Err) == ENOSYS || (Err) == EINVAL || (Err) == EBUSY)

 /* Define a replacement for acl_entries if needed.  */
 #if USE_ACL && HAVE_ACL_GET_FILE && HAVE_ACL_FREE && !HAVE_ACL_ENTRIES