From b4148f567d9bf7abc8e82a6f2e252f28da93f354 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 5 Oct 2007 10:55:26 +0200 Subject: 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. --- src/remove.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/remove.c') diff --git a/src/remove.c b/src/remove.c index ac1010953..3cbfe6683 100644 --- a/src/remove.c +++ b/src/remove.c @@ -1082,7 +1082,8 @@ remove_entry (int fd_cwd, Dirstack_state const *ds, char const *filename, if (! x->recursive || (cache_stat_ok (st) && !S_ISDIR (st->st_mode)) - || (errno == EACCES && is_nondir_lstat (fd_cwd, filename, st)) + || ((errno == EACCES || errno == EPERM) + && is_nondir_lstat (fd_cwd, filename, st)) ) { if (ignorable_missing (x, errno)) -- cgit v1.2.3-54-g00ecf