From: "Anthony G. Basile" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/elfix:master commit in: misc/install-xattr/
Date: Tue, 24 Jun 2014 21:49:39 +0000 (UTC) [thread overview]
Message-ID: <1403646607.18586b8eef2dee0f432d7f57b642fa177aebc788.blueness@gentoo> (raw)
commit: 18586b8eef2dee0f432d7f57b642fa177aebc788
Author: Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Tue Jun 24 19:07:08 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jun 24 21:50:07 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=18586b8e
Correctly determine dst path if src is in a dir
There is a mismatch between how install and install-xattr determines
the destination path.
When running `install src/a dst/' the correct output is `dst/a'.
install-xattr was incorrectly joining the paths so thought the output
was `dst/src/a' which did not exist.
A test case has been added to the test script too.
Signed-off-by: Jason Zaman <jason <AT> perfinion.com>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
misc/install-xattr/checkcopyattrs.sh | 11 ++++++++++-
misc/install-xattr/install-xattr.c | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/misc/install-xattr/checkcopyattrs.sh b/misc/install-xattr/checkcopyattrs.sh
index 2e8f30f..0249013 100755
--- a/misc/install-xattr/checkcopyattrs.sh
+++ b/misc/install-xattr/checkcopyattrs.sh
@@ -2,7 +2,7 @@
set -e
touch a b c
-mkdir -p d e
+mkdir -p d e f
setfattr -n user.foo -v "bar" a
setfattr -n user.bas -v "x" a
setfattr -n user.pax.flags -v "mr" a
@@ -27,6 +27,15 @@ setfattr -n user.pax.flags -v "r" c
[ "$(getfattr --only-values -n user.pax.flags d/b)" == "p" ]
[ "$(getfattr --only-values -n user.pax.flags d/c)" == "r" ]
+# This tests if the src file was inside a directory
+# the correct dst location should be f/a. NOT f/d/a.
+./install-xattr d/a f
+
+[ -x f/a ]
+[ ! -x f/d/a ]
+[ "$(getfattr --only-values -n user.foo f/a)" == "bar" ]
+[ "$(getfattr --only-values -n user.bas f/a)" == "x" ]
+
./install-xattr -t e a b c
[ "$(getfattr --only-values -n user.foo e/a)" == "bar" ]
diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 3d70b5e..f2157fd 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -382,7 +382,7 @@ main(int argc, char* argv[])
if (S_ISDIR(s.st_mode))
continue;
- path = path_join(target, argv[i]);
+ path = path_join(target, basename(argv[i]));
copyxattr(argv[i], path);
free(path);
}
next reply other threads:[~2014-06-24 21:49 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-24 21:49 Anthony G. Basile [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-29 3:57 [gentoo-commits] proj/elfix:master commit in: misc/install-xattr/ Sam James
2023-01-24 3:05 Sam James
2023-01-24 3:05 Sam James
2023-01-11 6:53 Sam James
2023-01-10 5:21 Sam James
2023-01-10 5:21 Sam James
2019-11-10 0:59 Anthony G. Basile
2019-11-10 0:54 Anthony G. Basile
2019-11-10 0:54 Anthony G. Basile
2019-11-09 18:24 Anthony G. Basile
2019-11-09 18:24 Anthony G. Basile
2019-04-14 18:40 Anthony G. Basile
2019-03-30 10:12 Anthony G. Basile
2015-06-08 13:07 Anthony G. Basile
2015-05-29 11:32 Anthony G. Basile
2014-11-02 21:46 Anthony G. Basile
2014-10-13 2:28 Anthony G. Basile
2014-10-13 2:20 Anthony G. Basile
2014-10-09 2:40 Anthony G. Basile
2014-07-21 21:25 Anthony G. Basile
2014-06-27 12:26 Anthony G. Basile
2014-06-27 12:26 Anthony G. Basile
2014-06-15 22:09 Anthony G. Basile
2014-06-11 11:25 Anthony G. Basile
2014-06-10 21:04 Anthony G. Basile
2014-06-10 1:49 Anthony G. Basile
2014-06-10 1:49 Anthony G. Basile
2014-06-08 20:27 Anthony G. Basile
2014-06-01 0:26 Anthony G. Basile
2014-02-13 19:08 Anthony G. Basile
2014-02-13 19:01 Anthony G. Basile
2014-02-13 18:48 Anthony G. Basile
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1403646607.18586b8eef2dee0f432d7f57b642fa177aebc788.blueness@gentoo \
--to=blueness@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox