Fix JuliaLang#20925, cp not preserving permissions

antoine-levitt · Jun 2, 2018 · 8e17163 · 8e17163
1 parent 5583ae4
commit 8e17163
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/base/file.jl b/base/file.jl
@@ -726,7 +726,7 @@ function sendfile(src::AbstractString, dst::AbstractString)
  src_file = open(src, JL_O_RDONLY)
  src_open = true
  dst_file = open(dst, JL_O_CREAT | JL_O_TRUNC | JL_O_WRONLY,
- S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP| S_IROTH | S_IWOTH)
+ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
  dst_open = true
 
  bytes = filesize(stat(src_file))
@@ -738,6 +738,8 @@ function sendfile(src::AbstractString, dst::AbstractString)
  if dst_open && isopen(dst_file)
  close(dst_file)
  end
+ # preserve permissions by default (issue #20925)
+ chmod(dst, filemode(src))
  end
 end
 

diff --git a/test/file.jl b/test/file.jl
@@ -81,8 +81,19 @@ if Sys.iswindows()
 else
  mktempdir() do tmpdir
  tmpfile=joinpath(tmpdir, "tempfile.txt")
+ tmpfile2=joinpath(tmpdir, "tempfile2.txt")
  touch(tmpfile)
+ cp(tmpfile, tmpfile2)
+ @test filemode(tmpfile) == filemode(tmpfile2)
+ rm(tmpfile2)
+ chmod(tmpfile, 0o777)
+ cp(tmpfile, tmpfile2)
+ @test filemode(tmpfile) == filemode(tmpfile2)
+ rm(tmpfile2)
  chmod(tmpfile, 0o707)
+ cp(tmpfile, tmpfile2)
+ @test filemode(tmpfile) == filemode(tmpfile2)
+ rm(tmpfile2)
  linkfile=joinpath(dir, "tempfile.txt")
  symlink(tmpfile, linkfile)
  permissions=0o776