From d7619b5fe899074ef196154b2eec54d51290d450 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 8 Sep 2006 17:08:53 +0000 Subject: mv and "cp -r" no longer fail when invoked with two arguments where the first one names a directory and the second name ends in a slash and doesn't exist. E.g., "mv dir B/", for nonexistent B, now succeeds, once more. This reverts part of the 2004-06-27 change for 5.3.0. * NEWS: Say the above. * src/mv.c (target_directory_operand): Don't require (here) that the target operand "look like" a directory. This change pushes the test down to the rename syscall level, where a "mv dir existing-non-dir/" will mistakenly succeed on older systems that ignore trailing slashes in the rename destination argument. * src/cp.c (target_directory_operand): Likewise, but for cp. * tests/mv/trailing-slash: Exercise the above fixes. * tests/cp/trailing-slash: New file. * tests/cp/Makefile.am (EXTRA_DIST): Add trailing-slash. --- src/cp.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/cp.c') diff --git a/src/cp.c b/src/cp.c index 8ef115373..679ef0fe7 100644 --- a/src/cp.c +++ b/src/cp.c @@ -518,9 +518,6 @@ make_dir_parents_private (char const *const_dir, size_t src_offset, static bool target_directory_operand (char const *file, struct stat *st, bool *new_dst) { - char const *b = last_component (file); - size_t blen = strlen (b); - bool looks_like_a_dir = (blen == 0 || ISSLASH (b[blen - 1])); int err = (stat (file, st) == 0 ? 0 : errno); bool is_a_dir = !err && S_ISDIR (st->st_mode); if (err) @@ -529,8 +526,6 @@ target_directory_operand (char const *file, struct stat *st, bool *new_dst) error (EXIT_FAILURE, err, _("accessing %s"), quote (file)); *new_dst = true; } - if (is_a_dir < looks_like_a_dir) - error (EXIT_FAILURE, err, _("target %s is not a directory"), quote (file)); return is_a_dir; } -- cgit v1.2.3-54-g00ecf