X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcopy-acl.c;h=bc2740a465212f6198e1fbd48cc92f875e8bb60e;hb=a5ca560fc2c96a9ac5723c2389fbf1d883c863b8;hp=73f370c9aa7a56547ebb9947e2c1dbf2a5f54ec1;hpb=7e766e7fc7aecffc5b37f4b799921de254a8450d;p=gnulib.git
diff --git a/lib/copy-acl.c b/lib/copy-acl.c
index 73f370c9a..bc2740a46 100644
--- a/lib/copy-acl.c
+++ b/lib/copy-acl.c
@@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see .
- Written by Paul Eggert and Andreas Gruenbacher. */
+ Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible. */
#include
@@ -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
@@ -57,7 +60,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
if (ACL_NOT_WELL_SUPPORTED (errno))
return qset_acl (dst_name, dest_desc, mode);
else
- return -2;
+ return -2;
}
if (HAVE_ACL_SET_FD && dest_desc != -1)
@@ -69,7 +72,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
int saved_errno = errno;
if (ACL_NOT_WELL_SUPPORTED (errno) && !acl_access_nontrivial (acl))
- {
+ {
acl_free (acl);
return chmod_or_fchmod (dst_name, dest_desc, mode);
}
@@ -108,7 +111,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
return -1;
}
else
- acl_free (acl);
+ acl_free (acl);
}
return 0;
@@ -144,7 +147,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
if (ACL_NOT_WELL_SUPPORTED (errno))
return qset_acl (dst_name, dest_desc, mode);
else
- return -2;
+ return -2;
}
if (HAVE_ACL_SET_FD && dest_desc != -1)
@@ -156,7 +159,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
int saved_errno = errno;
if (ACL_NOT_WELL_SUPPORTED (errno) && !acl_extended_nontrivial (acl))
- {
+ {
acl_free (acl);
return chmod_or_fchmod (dst_name, dest_desc, mode);
}
@@ -470,6 +473,38 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
}
return 0;
+#elif USE_ACL && HAVE_ACLX_GET && 0 /* AIX */
+
+ /* TODO */
+
+#elif USE_ACL && HAVE_STATACL /* older AIX */
+
+ union { struct acl a; char room[4096]; } u;
+ int ret;
+
+ if ((source_desc != -1
+ ? fstatacl (source_desc, STX_NORMAL, &u.a, sizeof (u))
+ : statacl (src_name, STX_NORMAL, &u.a, sizeof (u)))
+ < 0)
+ return -2;
+
+ ret = (dest_desc != -1
+ ? fchacl (dest_desc, &u.a, u.a.acl_len)
+ : chacl (dst_name, &u.a, u.a.acl_len));
+ if (ret < 0)
+ {
+ int saved_errno = errno;
+
+ chmod_or_fchmod (dst_name, dest_desc, mode);
+ errno = saved_errno;
+ return -1;
+ }
+
+ /* No need to call chmod_or_fchmod at this point, since the mode bits
+ S_ISUID, S_ISGID, S_ISVTX are also stored in the ACL. */
+
+ return 0;
+
#else
return qset_acl (dst_name, dest_desc, mode);