Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option for readdir to prepend the relative or absolute path #33004

Closed
wants to merge 3 commits into from
Closed

Add option for readdir to prepend the relative or absolute path #33004

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fe1c8a
Add option for readdir to prepend the relative or absolute path
tamasgal Aug 21, 2019
30f35b0
Remove trailing whitespaces
tamasgal Aug 21, 2019
3244e3d
Merge branch 'master' of https://github.com/JuliaLang/julia
tamasgal Aug 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 27 additions & 6 deletions base/file.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,9 +649,10 @@ struct uv_dirent_t
end

"""
readdir(dir::AbstractString=".") -> Vector{String}
readdir(dir::AbstractString="."; join=false, abspath=false) -> Vector{String}

Return the files and directories in the directory `dir` (or the current working directory if not given).
If `join=true`, prepend `dir` to the filenames and if `abspath=true`, use the absolute paths instead.

# Examples
```julia-repl
Expand All @@ -660,16 +661,31 @@ julia> readdir("/home/JuliaUser/Projects/julia")
".circleci"
".freebsdci.sh"
".git"
".gitattributes"
".github"
⋮
"test"
"ui"
"usr"
"usr-staging"

julia> readdir("doc", join=true)
11-element Array{String,1}:
"doc/.gitignore"
"doc/Makefile"
"doc/Manifest.toml"
⋮
"doc/make.jl"
"doc/man"
"doc/src"

julia> readdir("doc/src", abspath=true)
5-element Array{String,1}:
"/home/JuliaUser/Projects/julia/doc/src/assets"
"/home/JuliaUser/Projects/julia/doc/src/base"
"/home/JuliaUser/Projects/julia/doc/src/devdocs"
"/home/JuliaUser/Projects/julia/doc/src/index.md"
"/home/JuliaUser/Projects/julia/doc/src/manual"
```
"""
function readdir(path::AbstractString)
function readdir(path::AbstractString; join=false, abspath=false)
# Allocate space for uv_fs_t struct
uv_readdir_req = zeros(UInt8, ccall(:jl_sizeof_uv_fs_t, Int32, ()))

Expand All @@ -682,8 +698,13 @@ function readdir(path::AbstractString)
# iterate the listing into entries
entries = String[]
ent = Ref{uv_dirent_t}()
_path = abspath ? Base.abspath(path) : path
while Base.UV_EOF != ccall(:uv_fs_scandir_next, Cint, (Ptr{Cvoid}, Ptr{uv_dirent_t}), uv_readdir_req, ent)
push!(entries, unsafe_string(ent[].name))
filename = unsafe_string(ent[].name)
if join || abspath
filename = joinpath(_path, filename)
end
push!(entries, filename)
end

# Clean up the request string
Expand Down