* src/copy.c (copy_internal): Don't pass mkdir a mode greater than

7777.  This matches historical 'cp' behavior and avoids some
(though not all) implementation-defined behavior of mkdir.
* src/cp.c (make_dir_parents_private): Likewise.
* src/copy.c (copy_internal): Don't pass 'open' a mode greater
than 777.  This is required by POSIX.  It doesn't make any difference
in actual behavior on any host that I know of.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/cp.c b/src/cp.c
index 679ef0fe7..9ba334255 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -428,7 +428,11 @@ make_dir_parents_private (char const *const_dir, size_t src_offset,
 		}
 	      src_mode = stats.st_mode;
 
-	      if (mkdir (dir, src_mode))
+	      /* POSIX says mkdir's behavior is implementation-defined when
+		 (src_mode & ~S_IRWXUGO) != 0.  However, common practice is
+		 to ask mkdir to copy all the CHMOD_MODE_BITS, letting mkdir
+		 decide what to do with S_ISUID | S_ISGID | S_ISVTX.  */
+	      if (mkdir (dir, src_mode & CHMOD_MODE_BITS) != 0)
 		{
 		  error (0, errno, _("cannot make directory %s"),
 			 quote (dir));