diff options
| author | Andrew Church <achurch@achurch.org> | 2007-03-03 23:00:18 +0100 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-03-03 23:00:18 +0100 |
| commit | 2871ad3b45ed1b1f44be57fd453cf9a50a4c5af7 (patch) | |
| tree | e96f3a0493c5c82691063e8ad8855fa56b06fd52 | |
| parent | f0537a71f1e414ceb7ecaa7f872b73b401209082 (diff) | |
| download | coreutils-2871ad3b45ed1b1f44be57fd453cf9a50a4c5af7.tar.xz | |
Fix a bug: cp -x would fail to set mount point permissions.
* NEWS: mention cp -x bug fix
* src/copy.c (copy_internal): Don't return immediately after
copying a mount point that we do not intend to recurse under.
Based on a patch by Andrew Church.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/copy.c | 23 |
3 files changed, 23 insertions, 11 deletions
@@ -1,3 +1,12 @@ +2007-03-03 Andrew Church <achurch@achurch.org> (tiny change) + Paul Eggert <eggert@cs.ucla.edu> + + Fix a bug: cp -x would fail to set mount point permissions. + * NEWS: mention cp -x bug fix + * src/copy.c (copy_internal): Don't return immediately after + copying a mount point that we do not intend to recurse under. + Based on a patch by Andrew Church. + 2007-03-03 Jim Meyering <jim@meyering.net> pwd-unreadable-parent: Skip test on ia64/Linux, too. @@ -4,6 +4,8 @@ GNU coreutils NEWS -*- outline -*- ** Bug fixes + cp -x (--one-file-system) would fail to set mount point permissions + The default block size and output format for df -P are now unaffected by the DF_BLOCK_SIZE, BLOCK_SIZE, and BLOCKSIZE environment variables. It is still affected by POSIXLY_CORRECT, though. diff --git a/src/copy.c b/src/copy.c index 000c248eb..49bbb8ce4 100644 --- a/src/copy.c +++ b/src/copy.c @@ -1604,19 +1604,20 @@ copy_internal (char const *src_name, char const *dst_name, emit_verbose (src_name, dst_name, NULL); } - /* Are we crossing a file system boundary? */ + /* Decide whether to copy the contents of the directory. */ if (x->one_file_system && device != 0 && device != src_sb.st_dev) - return true; - - /* Copy the contents of the directory. */ - - if (! copy_dir (src_name, dst_name, new_dst, &src_sb, dir, x, - copy_into_self)) { - /* Don't just return here -- otherwise, the failure to read a - single file in a source directory would cause the containing - destination directory not to have owner/perms set properly. */ - delayed_ok = false; + /* Here, we are crossing a file system boundary and cp's -x option + is in effect: so don't copy the contents of this directory. */ + } + else + { + /* Copy the contents of the directory. Don't just return if + this fails -- otherwise, the failure to read a single file + in a source directory would cause the containing destination + directory not to have owner/perms set properly. */ + delayed_ok = copy_dir (src_name, dst_name, new_dst, &src_sb, dir, x, + copy_into_self); } } else if (x->symbolic_link) |