Preserve ACLs while copying.

diff --git a/ChangeLog b/ChangeLog
index ed397834270dc2771bf90f1469a1926e465fd5ed..778f87ba0a16844221af40cae6d4409e14eaee7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-22  Bruno Haible  <bruno@clisp.org>
+
+       * lib/copy-file.c: Include acl.h.
+       (copy_file_preserving) [USE_ACL]: Use copy_acl instead of chmod.
+       Close the file descriptors only after being done with copy_acl.
+       * modules/copy-file (Depends-on): Add acl.
+
 2006-12-22  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool (SED): New variable.

diff --git a/lib/copy-file.c b/lib/copy-file.c
index ca620dcb6ebaea42b0cf70066122c9a0c8b254b2..4314f4c6d147237afe521347694031ad6cee52eb 100644 (file)
--- a/lib/copy-file.c
+++ b/lib/copy-file.c
@@ -39,6 +39,7 @@
 #include "error.h"
 #include "safe-read.h"
 #include "full-write.h"
+#include "acl.h"
 #include "binary-io.h"
 #include "exit.h"
 #include "gettext.h"
@@ -80,10 +81,12 @@ copy_file_preserving (const char *src_filename, const char *dest_filename)
        error (EXIT_FAILURE, errno, _("error writing \"%s\""), dest_filename);
     }
 
+#if !USE_ACL
   if (close (dest_fd) < 0)
     error (EXIT_FAILURE, errno, _("error writing \"%s\""), dest_filename);
   if (close (src_fd) < 0)
     error (EXIT_FAILURE, errno, _("error after reading \"%s\""), src_filename);
+#endif
 
   /* Preserve the access and modification times.  */
 #if HAVE_UTIME
@@ -110,5 +113,17 @@ copy_file_preserving (const char *src_filename, const char *dest_filename)
 #endif
 
   /* Preserve the access permissions.  */
+#if USE_ACL
+  if (copy_acl (src_filename, src_fd, dest_filename, dest_fd, mode))
+    exit (EXIT_FAILURE);
+#else
   chmod (dest_filename, mode);
+#endif
+
+#if USE_ACL
+  if (close (dest_fd) < 0)
+    error (EXIT_FAILURE, errno, _("error writing \"%s\""), dest_filename);
+  if (close (src_fd) < 0)
+    error (EXIT_FAILURE, errno, _("error after reading \"%s\""), src_filename);
+#endif
 }

diff --git a/modules/copy-file b/modules/copy-file
index 27eb0fee1d0ddcbfc9a5dd66e86054f88c0697c5..7e82ce81ac53298703fefa886a82116013d223f6 100644 (file)
--- a/modules/copy-file
+++ b/modules/copy-file
@@ -10,6 +10,7 @@ Depends-on:
 error
 safe-read
 full-write
+acl
 binary-io
 exit
 gettext-h