summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOndřej Vašík <ovasik@redhat.com>2009-03-11 16:08:20 +0100
committerJim Meyering <meyering@redhat.com>2009-03-11 17:32:44 +0100
commitc160afe902c07f5052dbd97c726a997db7fa20c0 (patch)
tree3a63eb8e7bf75eb1d61d65a50c4c40f9e3c43847 /src
parentcf0bb5e05d89d9239a819b696a85532a582c8d38 (diff)
downloadcoreutils-c160afe902c07f5052dbd97c726a997db7fa20c0.tar.xz
cp: make -a option preserve xattrs, but with reduced diagnostics
* copy.c (copy_attr_by_fd): Reduce xattr diagnostics for 'cp -a'. (copy_attr_by_name): Likewise. * cp.c (main): Preserve xattrs with -a option, when possible. * doc/coreutils.texi: Document that xattrs are preserved with cp -a, with no added diagnostics. * NEWS: Mention the change. * tests/misc/xattr: Add tests for 'cp --preserve=all' and 'cp -a'.
Diffstat (limited to 'src')
-rw-r--r--src/copy.c20
-rw-r--r--src/cp.c1
2 files changed, 13 insertions, 8 deletions
diff --git a/src/copy.c b/src/copy.c
index e37fead52..9b0e139c6 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -159,7 +159,7 @@ copy_attr_free (struct error_context *ctx ATTRIBUTE_UNUSED,
static bool
copy_attr_by_fd (char const *src_path, int src_fd,
- char const *dst_path, int dst_fd)
+ char const *dst_path, int dst_fd, const struct cp_options *x)
{
struct error_context ctx =
{
@@ -167,11 +167,13 @@ copy_attr_by_fd (char const *src_path, int src_fd,
.quote = copy_attr_quote,
.quote_free = copy_attr_free
};
- return 0 == attr_copy_fd (src_path, src_fd, dst_path, dst_fd, 0, &ctx);
+ return 0 == attr_copy_fd (src_path, src_fd, dst_path, dst_fd, 0,
+ x->reduce_diagnostics ? NULL : &ctx);
}
static bool
-copy_attr_by_name (char const *src_path, char const *dst_path)
+copy_attr_by_name (char const *src_path, char const *dst_path,
+ const struct cp_options *x)
{
struct error_context ctx =
{
@@ -179,19 +181,21 @@ copy_attr_by_name (char const *src_path, char const *dst_path)
.quote = copy_attr_quote,
.quote_free = copy_attr_free
};
- return 0 == attr_copy_file (src_path, dst_path, 0, &ctx);
+ return 0 == attr_copy_file (src_path, dst_path, 0,
+ x-> reduce_diagnostics ? NULL :&ctx);
}
#else /* USE_XATTR */
static bool
copy_attr_by_fd (char const *src_path, int src_fd,
- char const *dst_path, int dst_fd)
+ char const *dst_path, int dst_fd, const struct cp_options *x)
{
return true;
}
static bool
-copy_attr_by_name (char const *src_path, char const *dst_path)
+copy_attr_by_name (char const *src_path, char const *dst_path,
+ const struct cp_options *x)
{
return true;
}
@@ -759,7 +763,7 @@ copy_reg (char const *src_name, char const *dst_name,
set_author (dst_name, dest_desc, src_sb);
if (x->preserve_xattr && ! copy_attr_by_fd (src_name, source_desc,
- dst_name, dest_desc)
+ dst_name, dest_desc, x)
&& x->require_preserve_xattr)
return false;
@@ -2076,7 +2080,7 @@ copy_internal (char const *src_name, char const *dst_name,
set_author (dst_name, -1, &src_sb);
- if (x->preserve_xattr && ! copy_attr_by_name (src_name, dst_name)
+ if (x->preserve_xattr && ! copy_attr_by_name (src_name, dst_name, x)
&& x->require_preserve_xattr)
return false;
diff --git a/src/cp.c b/src/cp.c
index af4bd601b..878507616 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -925,6 +925,7 @@ main (int argc, char **argv)
x.require_preserve = true;
if (selinux_enabled)
x.preserve_security_context = true;
+ x.preserve_xattr = true;
x.reduce_diagnostics = true;
x.recursive = true;
break;