Allow RPC_S_UUID_NO_ADDRESS; return filename when cleanup false; remo…

…ve let scoping

base/file.jl

@@ -510,9 +510,8 @@ function mktemp(parent::AbstractString=tempdir(); cleanup::Bool=true)
     return (filename, Base.open(filename, "r+"))
 end
 
-let
-global tempname
-
+# GUID  win32 api
+# TODO: refactor
 struct GUID
     l1::Culong
     w1::Cushort
@@ -529,7 +528,7 @@ function tempname(parent::AbstractString=tempdir(); cleanup::Bool=true)
 
     id = Ref{GUID}()
     r = ccall((:UuidCreate,:Rpcrt4), Cint, (Ref{GUID},), id)
-    r == 0 || (r == RPC_S_UUID_LOCAL_ONLY && (@warn "UIUD guaranteed to be unique to this computer only"; true)) || (r == RPC_S_UUID_NO_ADDRESS && error("Cannot get Ethernet or token-ring hardware address for this computer."))
+    (r == 0 || r == RPC_S_UUID_LOCAL_ONLY) || (r == RPC_S_UUID_NO_ADDRESS && error("Cannot get Ethernet or token-ring hardware address for this computer."))
 
     nameptr = Ref{Ptr{Cwchar_t}}()
     r = ccall((:UuidToStringW, :Rpcrt4), Cint, (Ref{GUID}, Ref{Ptr{Cwchar_t}}), id, nameptr)
@@ -540,17 +539,15 @@ function tempname(parent::AbstractString=tempdir(); cleanup::Bool=true)
 
     @assert ccall((:RpcStringFreeW, :Rpcrt4), Cint, (Ref{Ptr{Cwchar_t}},), nameptr) == 0
 
-    filename = joinpath(parent, name)
-    if !ispath(filename)
-        cleanup && temp_cleanup_later(filename)
+    filename = joinpath(parent, temp_prefix * name)
+    if !cleanup
         return filename
     else
-        tempname(parent; cleanup=cleanup)
+        # in the unlikley scenario filename is a path, call this function again regenerate a unique filename
+        return !ispath(filename) ? (temp_cleanup_later(filename); filename) : tempname(parent; cleanup=cleanup)
     end
 end
 
-end
-
 else # !windows
 
 # Obtain a temporary filename.