X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcopy-acl.c;h=af85a08fb9f5acef76d28d00fd7962e176bcd43f;hb=1a2869593e115e4a6c74aaa0b23ca612357403ce;hp=0f5931bc3c44d0bc58bba7d192c8605fd773ae33;hpb=45b218a2676681aa16f4bc92578abae99cad4921;p=gnulib.git

diff --git a/lib/copy-acl.c b/lib/copy-acl.c
index 0f5931bc3..af85a08fb 100644
--- a/lib/copy-acl.c
+++ b/lib/copy-acl.c
@@ -23,6 +23,9 @@
 
 #include "acl-internal.h"
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 
 /* Copy access control lists from one file to another. If SOURCE_DESC is
    a valid file descriptor, use file descriptor operations, else use
@@ -333,6 +336,16 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
   did_chmod = 0; /* set to 1 once the mode bits in 0777 have been set */
   saved_errno = 0; /* the first non-ignorable error code */
 
+  if (!MODE_INSIDE_ACL)
+    {
+      /* On Cygwin, it is necessary to call chmod before acl, because
+	 chmod can change the contents of the ACL (in ways that don't
+	 change the allowed accesses, but still visible).  */
+      if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0)
+	saved_errno = errno;
+      did_chmod = 1;
+    }
+
   /* If both ace_entries and entries are available, try SETACL before
      ACE_SETACL, because SETACL cannot fail with ENOTSUP whereas ACE_SETACL
      can.  */
@@ -342,7 +355,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
       ret = (dest_desc != -1
 	     ? facl (dest_desc, SETACL, count, entries)
 	     : acl (dst_name, SETACL, count, entries));
-      if (ret < 0)
+      if (ret < 0 && saved_errno == 0)
 	{
 	  saved_errno = errno;
 	  if (errno == ENOSYS && !acl_nontrivial (count, entries))
@@ -370,8 +383,8 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
   free (ace_entries);
 #  endif
 
-  if (!MODE_INSIDE_ACL
-      || did_chmod <= ((mode & (S_ISUID | S_ISGID | S_ISVTX)) ? 1 : 0))
+  if (MODE_INSIDE_ACL
+      && did_chmod <= ((mode & (S_ISUID | S_ISGID | S_ISVTX)) ? 1 : 0))
     {
       /* We did not call chmod so far, and either the mode and the ACL are
 	 separate or special bits are to be set which don't fit into ACLs.  */