From e772bddde8295fe0fdaef05b3c4c5e967116c805 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 25 Jul 2011 13:36:16 -0700 Subject: cp: don't mishandle existing dir dest permissions (Bug#9170) * src/copy.c (copy_internal): If we don't create the directory, then we cannot have omitted permissions. Problem and trivial fix reported by Eric Lammerts. * tests/Makefile.am (TESTS): Add cp/existing-perm-dir. * tests/cp/existing-perm-dir: New file. --- src/copy.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/copy.c') diff --git a/src/copy.c b/src/copy.c index df8b1db74..b2aeb6ece 100644 --- a/src/copy.c +++ b/src/copy.c @@ -2211,6 +2211,8 @@ copy_internal (char const *src_name, char const *dst_name, if (x->verbose) emit_verbose (src_name, dst_name, NULL); } + else + omitted_permissions = 0; /* Decide whether to copy the contents of the directory. */ if (x->one_file_system && device != 0 && device != src_sb.st_dev) -- cgit v1.2.3-54-g00ecf