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/mv.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/mv.c') diff --git a/src/mv.c b/src/mv.c index 1834f4c64..8b70d0048 100644 --- a/src/mv.c +++ b/src/mv.c @@ -32,6 +32,7 @@ #include "filenamecat.h" #include "quote.h" #include "remove.h" +#include "root-dev-ino.h" /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "mv" @@ -92,7 +93,6 @@ static void rm_option_init (struct rm_options *x) { x->ignore_missing_files = false; - x->root_dev_ino = NULL; x->recursive = true; x->one_file_system = false; @@ -108,6 +108,14 @@ rm_option_init (struct rm_options *x) the initial working directory, in case one of those is a `.'-relative name. */ x->require_restore_cwd = true; + + { + static struct dev_ino dev_ino_buf; + x->root_dev_ino = get_root_dev_ino (&dev_ino_buf); + if (x->root_dev_ino == NULL) + error (EXIT_FAILURE, errno, _("failed to get attributes of %s"), + quote ("/")); + } } static void -- cgit v1.2.3-54-g00ecf