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

Fix realpath on Windows #13582

Closed
wants to merge 2 commits into from
Closed

Fix realpath on Windows #13582

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5af6596
Fix realpath on Windows
malmaud Oct 13, 2015
d227a6c
Fix bug in realpath and longpath
malmaud Oct 13, 2015
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
17 changes: 8 additions & 9 deletions base/path.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,18 +110,17 @@ abspath(a::AbstractString, b::AbstractString...) = abspath(joinpath(a,b...))

@windows_only realpath(path::AbstractString) = realpath(utf16(path))
@windows_only function realpath(path::UTF16String)
p = UInt32((sizeof(path)>>2) + 1)
buf = Array(UInt16, length(path.data))
while true
buflength = p
buf = zeros(UInt16,buflength)
p = ccall((:GetFullPathNameW, "Kernel32"), stdcall,
UInt32, (Cwstring, UInt32, Ptr{UInt16}, Ptr{Void}),
path, buflength, buf, C_NULL)
path, length(buf), buf, C_NULL)
systemerror(:realpath, p == 0)
if (p < buflength)
resize!(buf, p+1)
return utf8(UTF16String(buf))
if p > length(buf)
resize!(buf, p)
continue
end
return encode_to_utf8(UInt16, buf, p)
end
end

Expand All @@ -134,11 +133,11 @@ end
path, buf, length(buf))
systemerror(:longpath, p == 0)
# Buffer wasn't big enough, in which case `p` is the necessary buffer size
if (p > length(buf))
if p > length(buf)
resize!(buf, p)
continue
end
return utf8(UTF16String(buf))
return encode_to_utf8(UInt16, buf, p)
end
end

Expand Down