On Saturday 15 November 2008 18:12:09 Jim Meyering wrote:
> Then it looks like you can adjust your patch to check for, and use,
> attr_copy_fd, rather than attr_copy_file. The only reason we use
> name-oriented interfaces (rather than fd-oriented ones) in copy.c
> is when there is no fd-oriented analog.
This seems to be trivial change in function copy_reg, but I can't see any easy
solution for copy_internal function. So in the attached patch are used both
variants:
copy_attr_by_fd - fd-oriented
copy_attr_by_name - name-oriented
> Also, please avoid this warning (seen at least on rawhide):
>
> copy.c:160: warning: passing argument 4 of 'attr_copy_file' from
> incompatible pointer type
It was actually a bug. It is fixed and tested in the attached patch. It is not
easy to cause error within libattr. I tested it with malformed libattr forced
by LD_PRELOAD, but no idea how to do this automatically.
> From /usr/include/attr/libattr.h:
>
> extern int attr_copy_file (const char *, const char *,
> int (*) (const char *, struct error_context
> *), struct error_context *);
> extern int attr_copy_fd (const char *, int, const char *, int,
> int (*) (const char *, struct error_context *),
> struct error_context *);
>
> When the above is fixed, maybe copy_attr_error will be gone.
Looking at libattr/attr_copy_fd.c code I can see it needs to print error
messages in the fd-oriented variant as well.
> If not, rewrite copy_attr_error not to use xmalloc (the comment
> there is now false: you can use gnulib's verror module),
> since copy.c is intended to be library-grade, when feasible.
Thanks for advice, rewritten to use verror module...
Let me just mention the patch for cp/mv -n option:
http://lists.gnu.org/archive/html/bug-coreutils/2008-10/msg00298.html
What is the status of this patch?
Kamil
From 1c81d575178528f3553b8f4e58a41d2bdf81a010 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <[EMAIL PROTECTED]>
Date: Tue, 18 Nov 2008 16:27:44 +0100
Subject: [PATCH] cp/mv: add xattr support
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
This patch was originally written by Andreas Grünbacher, nowadays
available at
http://www.suse.de/~agruen/coreutils/5.91/coreutils-xattr.diff
* bootstrap.conf: Add gnulib module verror.
* m4/xattr.m4: Check for libattr availability, new configure option
--disable-xattr.
* m4/prereq.m4: Require gl_FUNC_XATTR.
* src/Makefile.am: Link cp, mv and ginstall with libattr.
* src/copy.h: Add preserve_xattr to cp_options.
* src/copy.c (copy_attr_error): New function to handle errors during
xattr copying.
(copy_attr_quote): New function to quote file name in errors messages
printed by libattr.
(copy_attr_free): Empty function requested by libattr to free quoted
string.
(copy_attr_by_fd): New fd-oriented function to copy xattr.
(copy_attr_by_name): New name-oriented function to copy xattr.
(copy_reg, copy_internal): Call copy_extended_attributes function.
* src/cp.c (usage): Mention new --preserve=xattr option.
(decode_preserve_arg): Handle new --preserve=xattr option.
* src/mv.c: Always attempt to preserve xattr.
* src/install.c: Never attempt to preserve xattr.
* tests/misc/xattr: New test for xattr support in cp/mv.
* tests/Makefile.am: Add the new test to list.
* doc/coreutils.texi: Mention new --preserve=xattr option.
* NEWS: Mention the change.
---
NEWS | 2 +
bootstrap.conf | 2 +-
doc/coreutils.texi | 3 ++
m4/prereq.m4 | 1 +
m4/xattr.m4 | 36 +++++++++++++++++++++++
src/Makefile.am | 6 ++--
src/copy.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++
src/copy.h | 4 ++
src/cp.c | 15 ++++++++--
src/install.c | 1 +
src/mv.c | 1 +
tests/Makefile.am | 1 +
tests/misc/xattr | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++
13 files changed, 223 insertions(+), 7 deletions(-)
create mode 100644 m4/xattr.m4
create mode 100755 tests/misc/xattr
diff --git a/NEWS b/NEWS
index cbea67c..305dcc6 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ GNU coreutils NEWS -*- outline -*-
** New features
+ cp/mv: add xattr support, new option --preserve=xattr in cp
+
ls --color now highlights hard linked files, too
stat -f recognizes the Lustre file system type
diff --git a/bootstrap.conf b/bootstrap.conf
index aae307c..c7bd313 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -97,7 +97,7 @@ gnulib_modules="
userspec utimecmp utimens
vasprintf-posix
vc-list-files
- verify version-etc-fsf
+ verify version-etc-fsf verror
wcwidth winsz-ioctl winsz-termios write-any-file
xalloc
xfreopen
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 935129f..95cec82 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -7372,6 +7372,9 @@ Preserve in the destination files
any links between corresponding source files.
@c Give examples illustrating how hard links are preserved.
@c Also, show how soft links map to hard links with -L and -H.
[EMAIL PROTECTED] xattr
+Preserve extended (xattr) attributes if coreutils is compiled with xattr
+support.
@itemx all
Preserve all file attributes.
Equivalent to specifying all of the above.
diff --git a/m4/prereq.m4 b/m4/prereq.m4
index e65682f..536070e 100644
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -38,6 +38,7 @@ AC_DEFUN([gl_PREREQ],
# handles that; see ../bootstrap.conf.
AC_REQUIRE([gl_EUIDACCESS_STAT])
AC_REQUIRE([gl_FD_REOPEN])
+ AC_REQUIRE([gl_FUNC_XATTR])
AC_REQUIRE([gl_FUNC_XFTS])
AC_REQUIRE([gl_MEMXFRM])
AC_REQUIRE([gl_STRINTCMP])
diff --git a/m4/xattr.m4 b/m4/xattr.m4
new file mode 100644
index 0000000..b8e4c35
--- /dev/null
+++ b/m4/xattr.m4
@@ -0,0 +1,36 @@
+# xattr.m4 - check for Extended Attributes (Linux)
+
+# Copyright (C) 2003, 2008 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Originally written by Andreas Gruenbacher.
+# http://www.suse.de/~agruen/coreutils/5.91/coreutils-xattr.diff
+
+AC_DEFUN([gl_FUNC_XATTR],
+[
+ AC_ARG_ENABLE([xattr],
+ AC_HELP_STRING([--disable-xattr],
+ [turn off support for extended attributes]),
+ [use_xattr=$enableval], [use_xattr=yes])
+
+ if test "$use_xattr" = "yes"; then
+ AC_CHECK_HEADERS([attr/error_context.h attr/libattr.h])
+ if test $ac_cv_header_attr_libattr_h = yes \
+ && test $ac_cv_header_attr_error_context_h = yes; then
+ use_xattr=1
+ else
+ use_xattr=0
+ fi
+ AC_DEFINE_UNQUOTED([USE_XATTR], [$use_xattr],
+ [Define if you want extended attribute support.])
+ xattr_saved_LIBS=$LIBS
+ AC_SEARCH_LIBS([attr_copy_file], [attr],
+ [test "$ac_cv_search_attr_copy_file" = "none required" ||
+ LIB_XATTR=$ac_cv_search_attr_copy_file])
+ AC_CHECK_FUNCS([attr_copy_file])
+ LIBS=$xattr_saved_LIBS
+ AC_SUBST([LIB_XATTR])
+ fi
+])
diff --git a/src/Makefile.am b/src/Makefile.am
index 097cc7a..aab67d1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -149,9 +149,9 @@ su_LDADD = $(LDADD) $(LIB_CRYPT)
dir_LDADD += $(LIB_ACL)
ls_LDADD += $(LIB_ACL)
vdir_LDADD += $(LIB_ACL)
-cp_LDADD += $(LIB_ACL)
-mv_LDADD += $(LIB_ACL)
-ginstall_LDADD += $(LIB_ACL)
+cp_LDADD += $(LIB_ACL) $(LIB_XATTR)
+mv_LDADD += $(LIB_ACL) $(LIB_XATTR)
+ginstall_LDADD += $(LIB_ACL) $(LIB_XATTR)
stat_LDADD = $(LDADD) $(LIB_SELINUX)
diff --git a/src/copy.c b/src/copy.c
index bc1b20e..d057778 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -54,6 +54,13 @@
#include "areadlink.h"
#include "yesno.h"
+#if USE_XATTR
+# include <attr/error_context.h>
+# include <attr/libattr.h>
+# include <stdarg.h>
+# include "verror.h"
+#endif
+
#ifndef HAVE_FCHOWN
# define HAVE_FCHOWN false
# define fchown(fd, uid, gid) (-1)
@@ -123,6 +130,70 @@ is_ancestor (const struct stat *sb, const struct dir_list *ancestors)
return false;
}
+#if USE_XATTR
+static void
+copy_attr_error (struct error_context *ctx, char const *fmt, ...)
+{
+ int err = errno;
+ va_list ap;
+
+ /* use verror module to print error message */
+ va_start (ap, fmt);
+ verror(0, err, fmt, ap);
+ va_end (ap);
+}
+
+static char const *
+copy_attr_quote (struct error_context *ctx, char const *str)
+{
+ return quote(str);
+}
+
+static void
+copy_attr_free (struct error_context *ctx, char const *str)
+{
+}
+
+static bool
+copy_attr_by_fd (char const *src_path, int src_fd,
+ char const *dst_path, int dst_fd)
+{
+ struct error_context ctx =
+ {
+ .error = copy_attr_error,
+ .quote = copy_attr_quote,
+ .quote_free = copy_attr_free
+ };
+ return 0 == attr_copy_fd (src_path, src_fd, dst_path, dst_fd, 0, &ctx);
+}
+
+static bool
+copy_attr_by_name (char const *src_path, char const *dst_path)
+{
+ struct error_context ctx =
+ {
+ .error = copy_attr_error,
+ .quote = copy_attr_quote,
+ .quote_free = copy_attr_free
+ };
+ return 0 == attr_copy_file (src_path, dst_path, 0, &ctx);
+}
+#else /* USE_XATTR */
+
+static bool
+copy_attr_by_fd (char const *src_path, int src_fd,
+ char const *dst_path, int dst_fd)
+{
+ return true;
+}
+
+static bool
+copy_attr_by_name (char const *src_path, char const *dst_path)
+{
+ return true;
+}
+#endif /* USE_XATTR */
+
/* Read the contents of the directory SRC_NAME_IN, and recursively
copy the contents to DST_NAME_IN. NEW_DST is true if
DST_NAME_IN is a directory that was created previously in the
@@ -681,6 +752,10 @@ 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))
+ return_val = false;
+
if (x->preserve_mode || x->move_mode)
{
if (copy_acl (src_name, source_desc, dst_name, dest_desc, src_mode) != 0
@@ -1979,6 +2054,9 @@ 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))
+ delayed_ok = false;
+
if (x->preserve_mode || x->move_mode)
{
if (copy_acl (src_name, -1, dst_name, -1, src_mode) != 0
diff --git a/src/copy.h b/src/copy.h
index 12b7c2d..bc2ca41 100644
--- a/src/copy.h
+++ b/src/copy.h
@@ -173,6 +173,10 @@ struct cp_options
fail if it is unable to do so. */
bool require_preserve_context;
+ /* If true, attempt to preserve extended attributes using libattr.
+ Ignored if coreutils are compiled without xattr support. */
+ bool preserve_xattr;
+
/* If true, copy directories recursively and copy special files
as themselves rather than copying their contents. */
bool recursive;
diff --git a/src/cp.c b/src/cp.c
index 95eba0c..9b081d4 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -197,7 +197,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
-p same as --preserve=mode,ownership,timestamps\n\
--preserve[=ATTR_LIST] preserve the specified attributes (default:\n\
mode,ownership,timestamps), if possible\n\
- additional attributes: context, links, all\n\
+ additional attributes: context, links, xattr,\n\
+ all\n\
"), stdout);
fputs (_("\
--no-preserve=ATTR_LIST don't preserve the specified attributes\n\
@@ -774,6 +775,7 @@ cp_option_init (struct cp_options *x)
x->preserve_timestamps = false;
x->preserve_security_context = false;
x->require_preserve_context = false;
+ x->preserve_xattr = false;
x->require_preserve = false;
x->recursive = false;
@@ -810,18 +812,20 @@ decode_preserve_arg (char const *arg, struct cp_options *x, bool on_off)
PRESERVE_OWNERSHIP,
PRESERVE_LINK,
PRESERVE_CONTEXT,
+ PRESERVE_XATTR,
PRESERVE_ALL
};
static enum File_attribute const preserve_vals[] =
{
PRESERVE_MODE, PRESERVE_TIMESTAMPS,
- PRESERVE_OWNERSHIP, PRESERVE_LINK, PRESERVE_CONTEXT, PRESERVE_ALL
+ PRESERVE_OWNERSHIP, PRESERVE_LINK, PRESERVE_CONTEXT, PRESERVE_XATTR,
+ PRESERVE_ALL
};
/* Valid arguments to the `--preserve' option. */
static char const* const preserve_args[] =
{
"mode", "timestamps",
- "ownership", "links", "context", "all", NULL
+ "ownership", "links", "context", "xattr", "all", NULL
};
ARGMATCH_VERIFY (preserve_args, preserve_vals);
@@ -862,6 +866,10 @@ decode_preserve_arg (char const *arg, struct cp_options *x, bool on_off)
x->require_preserve_context = on_off;
break;
+ case PRESERVE_XATTR:
+ x->preserve_xattr = on_off;
+ break;
+
case PRESERVE_ALL:
x->preserve_mode = on_off;
x->preserve_timestamps = on_off;
@@ -869,6 +877,7 @@ decode_preserve_arg (char const *arg, struct cp_options *x, bool on_off)
x->preserve_links = on_off;
if (selinux_enabled)
x->preserve_security_context = on_off;
+ x->preserve_xattr = on_off;
break;
default:
diff --git a/src/install.c b/src/install.c
index 9dda05a..9bf9eee 100644
--- a/src/install.c
+++ b/src/install.c
@@ -200,6 +200,7 @@ cp_option_init (struct cp_options *x)
x->open_dangling_dest_symlink = false;
x->update = false;
x->preserve_security_context = false;
+ x->preserve_xattr = false;
x->verbose = false;
x->dest_info = NULL;
x->src_info = NULL;
diff --git a/src/mv.c b/src/mv.c
index fc255f3..bbe863e 100644
--- a/src/mv.c
+++ b/src/mv.c
@@ -139,6 +139,7 @@ cp_option_init (struct cp_options *x)
x->preserve_security_context = selinux_enabled;
x->require_preserve = false; /* FIXME: maybe make this an option */
x->require_preserve_context = false;
+ x->preserve_xattr = true;
x->recursive = true;
x->sparse_mode = SPARSE_AUTO; /* FIXME: maybe make this an option */
x->symbolic_link = false;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e955d9b..a3a7e2c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -231,6 +231,7 @@ TESTS = \
misc/tty-eof \
misc/unexpand \
misc/uniq \
+ misc/xattr \
chmod/c-option \
chmod/equal-x \
chmod/equals \
diff --git a/tests/misc/xattr b/tests/misc/xattr
new file mode 100755
index 0000000..2f50134
--- /dev/null
+++ b/tests/misc/xattr
@@ -0,0 +1,80 @@
+#!/bin/sh
+# Ensure that cp --preserve=xattr and mv preserve extended attributes.
+
+# Copyright (C) 2008 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+if test "$VERBOSE" = yes; then
+ set -x
+ cp --version
+ mv --version
+fi
+
+. $srcdir/test-lib.sh
+
+# Skip this test if cp was built without xattr support:
+grep '^#define USE_XATTR 1' $CONFIG_HEADER > /dev/null ||
+ skip_test_ "coreutils built without xattr support"
+
+# this code was taken from test mv/backup-is-src
+cleanup_() { rm -rf "$other_partition_tmpdir"; }
+. "$abs_srcdir/other-fs-tmpdir"
+b_other="$other_partition_tmpdir/b"
+rm -f $b_other || framework_failure
+
+# testing xattr name-value pair
+xattr_name="user.foo"
+xattr_value="bar"
+xattr_pair="$xattr_name=\"$xattr_value\""
+
+# create new file and check its xattrs
+touch a || framework_failure
+getfattr -d a > out_a || skip_test_ "failed to get xattr of file"
+grep -F "$xattr_pair" out_a > /dev/null && framework_failure
+
+# try to set user xattr on file
+setfattr -n "$xattr_name" -v "$xattr_value" a > out_a \
+ || skip_test_ "failed to set xattr of file"
+getfattr -d a > out_a || skip_test_ "failed to get xattr of file"
+grep -F "$xattr_pair" out_a > /dev/null \
+ || skip_test_ "failed to set xattr of file"
+
+fail=0
+
+# cp should not preserve xattr by default
+cp 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=xattr option works
+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
+
+rm b || framework_failure
+
+# mv should preserve xattr when not copying content
+# (implicit and probably expected behavior)
+mv 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
+
+# mv should even preserve xattr when copying content from one partition
+# to another
+mv b $b_other || fail=1
+getfattr -d $b_other > out_b || skip_test_ "failed to get xattr of file"
+grep -F "$xattr_pair" out_b > /dev/null || fail=1
+
+Exit $fail
--
1.5.4.3
_______________________________________________
Bug-coreutils mailing list
Bug-coreutils@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-coreutils
