From 3ae1edd5a98fa3b44150fc83b43a52dfad1e74fc Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Sat, 21 Jan 2017 21:22:57 -0500 Subject: [PATCH] cp/mv - exit if unable to read source xattr. --- bin/xattr.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/bin/xattr.cpp b/bin/xattr.cpp index 0ced907..ea6d18d 100644 --- a/bin/xattr.cpp +++ b/bin/xattr.cpp @@ -423,7 +423,6 @@ int op_rm(int argc, char **argv) warn("removexattr(\"%s\", \"%s\")", fname, attr_name); rv = 1; } - } return rv; @@ -451,8 +450,8 @@ int op_cp(int argc, char **argv) std::vector buffer; if (read_xattr(fname, src_attr_name, buffer) < 0) { - warn("getxattr(\"%s\", \"%s\")", fname, src_attr_name); - + warn("getxattr(\"%s\", \"%s\")", fname, src_attr_name); + return -1; } ssize_t asize = setxattr(fname, dest_attr_name, buffer.data(), buffer.size(), 0); @@ -489,8 +488,8 @@ int op_mv(int argc, char **argv) std::vector buffer; if (read_xattr(fname, src_attr_name, buffer) < 0) { - warn("getxattr(\"%s\", \"%s\")", fname, src_attr_name); - + warn("getxattr(\"%s\", \"%s\")", fname, src_attr_name); + return -1; } ssize_t asize = setxattr(fname, dest_attr_name, buffer.data(), buffer.size(), 0);