diff options
author | Jim Meyering <meyering@redhat.com> | 2007-10-05 10:55:26 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2007-10-05 13:26:46 +0200 |
commit | b4148f567d9bf7abc8e82a6f2e252f28da93f354 (patch) | |
tree | c02cabad7e804828d02acc5875bf9ae10f303a27 /src/c99-to-c89.diff | |
parent | 068fa34adcb846244c81704de2872102310de86e (diff) | |
download | coreutils-b4148f567d9bf7abc8e82a6f2e252f28da93f354.tar.xz |
Make a failing cross-partition mv give a sensible diagnostic.
A cross-partition move of a file in a sticky tmpdir and owned by
another user would evoke an invalid diagnostic after copying it:
mv: cannot remove `x': Operation not permitted
Either of the following (mv.c, remove.c) changes would fix the bug by
itself. I think it's slightly better to use both; the added cost is
minimal: mv: an extra lstat-per-mv-cmdline-arg-that-goes-cross-partition,
rm: an extra lstat-per-unlink-that-fails-w/EPERM.
* src/remove.c (remove_entry): Also lstat the file upon EPERM.
* src/mv.c (rm_option_init): Initialize root_dev_ino just as is done
in rm, so that a cross-partition invoked remove.c:rm call works the
same way as one invoked from the command-line use of "rm". That
setting of root_dev_ino makes rm() do the equivalent of an additional
lstat for each argument, which in turn gives rm enough information to
issue the right diagnostic.
* tests/mv/sticky-to-xpart (version): New file. Test for the above.
* tests/mv/Makefile.am (TESTS): Add sticky-to-xpart.
Arrange for "make check-root" to run the new root-only test.
* tests/Makefile.am (tb): New target, to run the new root-only test.
(all_t): Add tb.
* src/c99-to-c89.diff: Adjust offsets.
Diffstat (limited to 'src/c99-to-c89.diff')
-rw-r--r-- | src/c99-to-c89.diff | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/c99-to-c89.diff b/src/c99-to-c89.diff index 01e213beb..8a3737247 100644 --- a/src/c99-to-c89.diff +++ b/src/c99-to-c89.diff @@ -42,7 +42,7 @@ diff -upr src/remove.c src/remove.c if (!yesno ()) return RM_USER_DECLINED; -@@ -1533,6 +1537,7 @@ rm_1 (Dirstack_state *ds, char const *fi +@@ -1534,6 +1538,7 @@ rm_1 (Dirstack_state *ds, char const *fi return RM_ERROR; } @@ -50,7 +50,7 @@ diff -upr src/remove.c src/remove.c struct stat st; cache_stat_init (&st); cycle_check_init (&ds->cycle_check_state); -@@ -1555,6 +1560,7 @@ rm_1 (Dirstack_state *ds, char const *fi +@@ -1556,6 +1561,7 @@ rm_1 (Dirstack_state *ds, char const *fi AD_push_initial (ds); AD_INIT_OTHER_MEMBERS (); @@ -58,7 +58,7 @@ diff -upr src/remove.c src/remove.c enum RM_status status = remove_entry (AT_FDCWD, ds, filename, DT_UNKNOWN, &st, x); if (status == RM_NONEMPTY_DIR) -@@ -1573,6 +1579,8 @@ rm_1 (Dirstack_state *ds, char const *fi +@@ -1574,6 +1580,8 @@ rm_1 (Dirstack_state *ds, char const *fi ds_clear (ds); return status; } |