From 57d3893e8454f766e0b48e107b10e64da9c511be Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Tue, 17 Feb 2009 16:06:48 +0100 Subject: [PATCH] cp: make -a option preserve xattrs 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 * tests/misc/xattr: Add tests for 'cp --preserve=all' and 'cp -a'. --- doc/coreutils.texi | 9 ++++----- src/copy.c | 22 +++++++++++++--------- src/cp.c | 1 + tests/misc/xattr | 15 +++++++++++++-- 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/doc/coreutils.texi b/doc/coreutils.texi index ba6f6e0..762d083 100644 --- a/doc/coreutils.texi +++ b/doc/coreutils.texi @@ -7261,11 +7261,10 @@ The program accepts the following options. Also see @ref{Common options}. Preserve as much as possible of the structure and attributes of the original files in the copy (but do not attempt to preserve internal directory structure; i.e., @samp{ls -U} may list the entries in a copied -directory in a different order). Try to preserve SELinux security context, -but do not fail when this is not succesful. Diagnostic errors are not -displayed for this non-guaranteed attribute. Option doesn't preserve -extended attributes(xattr) at the moment. -Equivalent to @option{-dR --preserve=all} with few exceptions. +directory in a different order). Try to preserve SELinux security context +and extended attributes (xattr), but do not fail when this is not succesful. +Diagnostic errors are not displayed for those non-guaranteed attributes. +Equivalent to @option{-dR --preserve=all} with reduced diagnostics. @item -b @itemx @address@hidden@var{method}]} diff --git a/src/copy.c b/src/copy.c index 7a7fae4..99befa5 100644 --- a/src/copy.c +++ b/src/copy.c @@ -152,13 +152,13 @@ copy_attr_quote (struct error_context *ctx ATTRIBUTE_UNUSED, char const *str) static void copy_attr_free (struct error_context *ctx ATTRIBUTE_UNUSED, - char const *str ATTRIBUTE_UNUSED) + char const *str 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 = { @@ -166,11 +166,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 = { @@ -178,19 +180,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; } @@ -757,7 +761,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; @@ -2067,7 +2071,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 57907cc..0dda228 100644 --- a/src/cp.c +++ b/src/cp.c @@ -931,6 +931,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; diff --git a/tests/misc/xattr b/tests/misc/xattr index 4137c53..f067ff5 100755 --- a/tests/misc/xattr +++ b/tests/misc/xattr @@ -1,6 +1,7 @@ #!/bin/sh -# Ensure that cp --preserve=xattr and mv preserve extended attributes and -# install does not preserve extended attributes. +# Ensure that cp --preserve=xattr, cp --preserve=all and mv preserve extended +# attributes and install does not preserve extended attributes. +# cp -a should preserve xattr, error diagnostics should not be displayed # Copyright (C) 2009 Free Software Foundation, Inc. @@ -66,6 +67,16 @@ cp --preserve=xattr a b || fail=1 getfattr -d b >out_b || skip_test_ "failed to get xattr of file" grep -F "$xattr_pair" out_b >/dev/null || fail=1 +#test if --preserve=all option works +cp --preserve=all a c || fail=1 +getfattr -d c >out_c || skip_test_ "failed to get xattr of file" +grep -F "$xattr_pair" out_c >/dev/null || fail=1 + +#test if -a option works without any diagnostics +cp -a a d 2>err && test -s err && fail=1 +getfattr -d d >out_d || skip_test_ "failed to get xattr of file" +grep -F "$xattr_pair" out_d >/dev/null || fail=1 + rm b || framework_failure # install should never preserve xattr -- 1.5.6.1.156.ge903b