Skip to content

Commit 08861c7

Browse files
authored
Merge pull request #35625 from JuliaLang/sf/uv_fs_access
2 parents 76d6a08 + f5a6779 commit 08861c7

File tree

89 files changed

+79
-66
lines changed
  • base
  • deps
    • checksums
      • LibUV.v2.0.0+1.24.0-julia-0.aarch64-linux-gnu.tar.gz
      • LibUV.v2.0.0+1.24.0-julia-0.aarch64-linux-musl.tar.gz
      • LibUV.v2.0.0+1.24.0-julia-0.armv7l-linux-gnueabihf.tar.gz
      • LibUV.v2.0.0+1.24.0-julia-0.armv7l-linux-musleabihf.tar.gz
      • LibUV.v2.0.0+1.24.0-julia-0.i686-linux-gnu.tar.gz
      • LibUV.v2.0.0+1.24.0-julia-0.i686-linux-musl.tar.gz
      • LibUV.v2.0.0+1.24.0-julia-0.i686-w64-mingw32.tar.gz
      • LibUV.v2.0.0+1.24.0-julia-0.powerpc64le-linux-gnu.tar.gz
      • LibUV.v2.0.0+1.24.0-julia-0.x86_64-apple-darwin14.tar.gz
      • LibUV.v2.0.0+1.24.0-julia-0.x86_64-linux-gnu.tar.gz
      • LibUV.v2.0.0+1.24.0-julia-0.x86_64-linux-musl.tar.gz
      • LibUV.v2.0.0+1.24.0-julia-0.x86_64-unknown-freebsd11.1.tar.gz
      • LibUV.v2.0.0+1.24.0-julia-0.x86_64-w64-mingw32.tar.gz
      • LibUV.v2.0.0+1.29.1-julia-0.aarch64-linux-gnu.tar.gz
      • LibUV.v2.0.0+1.29.1-julia-0.aarch64-linux-musl.tar.gz
      • LibUV.v2.0.0+1.29.1-julia-0.armv7l-linux-gnueabihf.tar.gz
      • LibUV.v2.0.0+1.29.1-julia-0.armv7l-linux-musleabihf.tar.gz
      • LibUV.v2.0.0+1.29.1-julia-0.i686-linux-gnu.tar.gz
      • LibUV.v2.0.0+1.29.1-julia-0.i686-linux-musl.tar.gz
      • LibUV.v2.0.0+1.29.1-julia-0.i686-w64-mingw32.tar.gz
      • LibUV.v2.0.0+1.29.1-julia-0.powerpc64le-linux-gnu.tar.gz
      • LibUV.v2.0.0+1.29.1-julia-0.x86_64-apple-darwin14.tar.gz
      • LibUV.v2.0.0+1.29.1-julia-0.x86_64-linux-gnu.tar.gz
      • LibUV.v2.0.0+1.29.1-julia-0.x86_64-linux-musl.tar.gz
      • LibUV.v2.0.0+1.29.1-julia-0.x86_64-unknown-freebsd11.1.tar.gz
      • LibUV.v2.0.0+1.29.1-julia-0.x86_64-w64-mingw32.tar.gz
      • LibUV.v2.0.0-6.aarch64-linux-gnu.tar.gz
      • LibUV.v2.0.0-6.aarch64-linux-musl.tar.gz
      • LibUV.v2.0.0-6.armv7l-linux-gnueabihf.tar.gz
      • LibUV.v2.0.0-6.armv7l-linux-musleabihf.tar.gz
      • LibUV.v2.0.0-6.i686-linux-gnu.tar.gz
      • LibUV.v2.0.0-6.i686-linux-musl.tar.gz
      • LibUV.v2.0.0-6.i686-w64-mingw32.tar.gz
      • LibUV.v2.0.0-6.powerpc64le-linux-gnu.tar.gz
      • LibUV.v2.0.0-6.x86_64-apple-darwin14.tar.gz
      • LibUV.v2.0.0-6.x86_64-linux-gnu.tar.gz
      • LibUV.v2.0.0-6.x86_64-linux-musl.tar.gz
      • LibUV.v2.0.0-6.x86_64-unknown-freebsd11.1.tar.gz
      • LibUV.v2.0.0-6.x86_64-w64-mingw32.tar.gz
      • libuv-35b1504507a7a4168caae3d78db54d1121b121e1.tar.gz
      • libuv-f8f08f0fbdb7b46037bdf57a0730fb5658a8035d.tar.gz
  • src
  • test

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+79
-66
lines changed

base/file.jl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -989,6 +989,11 @@ Change the permissions mode of `path` to `mode`. Only integer `mode`s (e.g. `0o7
989989
currently supported. If `recursive=true` and the path is a directory all permissions in
990990
that directory will be recursively changed.
991991
Return `path`.
992+
993+
!!! note
994+
Prior to Julia 1.5, this did not correctly manipulate filesystem ACLs
995+
on Windows, therefore it would only set read-only bits on files. It
996+
now is able to manipulate ACLs.
992997
"""
993998
function chmod(path::AbstractString, mode::Integer; recursive::Bool=false)
994999
err = ccall(:jl_fs_chmod, Int32, (Cstring, Cint), path, mode)

base/sysinfo.jl

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -438,16 +438,18 @@ const WINDOWS_VISTA_VER = v"6.0"
438438
Sys.isexecutable(path::String)
439439
440440
Return `true` if the given `path` has executable permissions.
441+
442+
!!! note
443+
Prior to Julia 1.5, this did not correctly interrogate filesystem
444+
ACLs on Windows, therefore it would return `true` for any
445+
file. From Julia 1.5 on, it correctly determines whether the
446+
file is marked as executable or not.
441447
"""
442448
function isexecutable(path::String)
443-
if iswindows()
444-
return isfile(path)
445-
else
446-
# We use `access()` and `X_OK` to determine if a given path is
447-
# executable by the current user. `X_OK` comes from `unistd.h`.
448-
X_OK = 0x01
449-
ccall(:access, Cint, (Ptr{UInt8}, Cint), path, X_OK) == 0
450-
end
449+
# We use `access()` and `X_OK` to determine if a given path is
450+
# executable by the current user. `X_OK` comes from `unistd.h`.
451+
X_OK = 0x01
452+
return ccall(:jl_fs_access, Cint, (Ptr{UInt8}, Cint), path, X_OK) == 0
451453
end
452454
isexecutable(path::AbstractString) = isexecutable(String(path))
453455

deps/Versions.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ CURL_BB_REL = 1
2929
LIBGIT2_VER = 0.28.2
3030
LIBGIT2_BB_REL = 1
3131
LIBUV_VER = 1.29.1
32-
LIBUV_BB_REL = 0
32+
LIBUV_BB_REL = 6
3333
OBJCONV_VER = 2.49.0
3434
OBJCONV_BB_REL = 0
3535
ZLIB_VER = 1.2.11

deps/checksums/LibUV.v2.0.0+1.24.0-julia-0.aarch64-linux-gnu.tar.gz/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/LibUV.v2.0.0+1.24.0-julia-0.aarch64-linux-gnu.tar.gz/sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/LibUV.v2.0.0+1.24.0-julia-0.aarch64-linux-musl.tar.gz/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/LibUV.v2.0.0+1.24.0-julia-0.aarch64-linux-musl.tar.gz/sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/LibUV.v2.0.0+1.24.0-julia-0.armv7l-linux-gnueabihf.tar.gz/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/LibUV.v2.0.0+1.24.0-julia-0.armv7l-linux-gnueabihf.tar.gz/sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/LibUV.v2.0.0+1.24.0-julia-0.armv7l-linux-musleabihf.tar.gz/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)