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

Extend mktemp to support file suffixes. #13969

Closed
wants to merge 6 commits into from
Closed

Extend mktemp to support file suffixes. #13969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ce25106
Extend mktemp to support file suffixes.
maleadt Nov 13, 2015
d71f84c
Replace calls to mkstemp/mkstemps to only mkstemps.
maleadt Nov 16, 2015
825b7e6
Compact test.
maleadt Nov 16, 2015
8be70f3
Try-out for mktemp(suffix) for Windows.
maleadt Nov 16, 2015
7c9ec49
Fix .tmp suffix detection in mktemp.
maleadt Nov 17, 2015
f661759
Fix a wrong comment.
maleadt Nov 17, 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
4 changes: 2 additions & 2 deletions base/docs/helpdb.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6114,9 +6114,9 @@ See also: :func:`extrema` that returns ``(minimum(x), maximum(x))``
minmax

doc"""
mktemp([parent=tempdir()])
mktemp([parent=tempdir()]; suffix="")

Returns `(path, io)`, where `path` is the path of a new temporary file in `parent` and `io` is an open file object for this path.
Returns `(path, io)`, where `path` is the path of a new temporary file in `parent` (with suffix `suffix`) and `io` is an open file object for this path.
"""
mktemp(?)

Expand Down
23 changes: 17 additions & 6 deletions base/file.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,9 @@ end
tempdir() = dirname(tempname())

# Create and return the name of a temporary file along with an IOStream
function mktemp(parent=tempdir())
b = joinpath(parent, "tmpXXXXXX")
p = ccall(:mkstemp, Int32, (Ptr{UInt8},), b) # modifies b
function mktemp(parent=tempdir(); suffix="")
b = joinpath(parent, "tmpXXXXXX$suffix")
p = ccall(:mkstemps, Int32, (Ptr{UInt8}, Cint), b, length(suffix))
systemerror(:mktemp, p == -1)
return (b, fdio(p, true))
end
Expand Down Expand Up @@ -225,8 +225,19 @@ function tempname(temppath::AbstractString,uunique::UInt32)
resize!(tname,lentname+1)
return utf8(UTF16String(tname))
end
function mktemp(parent=tempdir())
function mktemp(parent=tempdir(); suffix="")
filename = tempname(parent, UInt32(0))
if length(suffix) > 0
fnlen = length(filename)
if fnlen < 4 || lowercase(filename[fnlen-3:end]) != ".tmp"
error("mktemp failed: invalid result by GetTempFileName")
end
new_filename = filename[1:fnlen-4] * suffix
# NOTE: new_filename is not guaranteed to be nonexistent,
# but at least then mv will error out.
mv(filename, new_filename)
filename = new_filename
end
return (filename, Base.open(filename, "r+"))
end
function mktempdir(parent=tempdir())
Expand All @@ -246,8 +257,8 @@ function mktempdir(parent=tempdir())
end
end

function mktemp(fn::Function, parent=tempdir())
(tmp_path, tmp_io) = mktemp(parent)
function mktemp(fn::Function, parent=tempdir(); suffix="")
(tmp_path, tmp_io) = mktemp(parent, suffix=suffix)
try
fn(tmp_path, tmp_io)
finally
Expand Down
5 changes: 5 additions & 0 deletions test/file.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,11 @@ close(f)
@test readall(p) == "Here is some text"
rm(p)

mktemp(suffix=".foo") do p, f
@test isfile(p) == true
@test endswith(p, ".foo") == true
end

let
tmp_path = mktemp() do p, io
@test isfile(p)
Expand Down