connect, getaddrinfo: generalize for all kinds of strings [#4002].

Author: StefanKarpinski

base/socket.jl

@@ -389,11 +389,12 @@ function _uv_hook_getaddrinfo(cb::Function, addrinfo::Ptr{Void}, status::Int32)
     ccall(:uv_freeaddrinfo,Void,(Ptr{Void},),freeaddrinfo)
 end
 
-function getaddrinfo(cb::Function,host::ASCIIString)
+function getaddrinfo(cb::Function, host::ASCIIString)
     callback_dict[cb] = cb
     uv_error("getaddrinfo",ccall(:jl_getaddrinfo, Int32, (Ptr{Void}, Ptr{Uint8}, Ptr{Uint8}, Any),
         eventloop(), host, C_NULL, cb))
 end
+getaddrinfo(cb::Function, host::String) = getaddrinfo(cb,ascii(host))
 
 function getaddrinfo(host::ASCIIString)
     c = Condition()
@@ -404,6 +405,7 @@ function getaddrinfo(host::ASCIIString)
     isa(ip,UVError) && throw(ip)
     return ip::IpAddr
 end
+getaddrinfo(host::String) = getaddrinfo(ascii(host))
 
 const _sizeof_uv_interface_address = ccall(:jl_uv_sizeof_interface_address,Int32,())
 
@@ -462,13 +464,13 @@ connect(sock::TcpSocket, port::Integer) = connect(sock,IPv4(127,0,0,1),port)
 connect(port::Integer) = connect(IPv4(127,0,0,1),port)
 
 # Valid connect signatures for TCP
-connect(host::ASCIIString, port::Integer) = connect(TcpSocket(),host,port)
+connect(host::String, port::Integer) = connect(TcpSocket(),host,port)
 connect(addr::IpAddr, port::Integer) = connect(TcpSocket(),addr,port)
 connect(addr::InetAddr) = connect(TcpSocket(),addr)
 
 default_connectcb(sock,status) = nothing
 
-function connect!(sock::TcpSocket, host::ASCIIString, port::Integer)
+function connect!(sock::TcpSocket, host::String, port::Integer)
     @assert sock.status == StatusInit
     ipaddr = getaddrinfo(host) 
     sock.status = StatusInit

base/stream.jl

@@ -828,13 +828,14 @@ function listen(path::ByteString)
     sock
 end
 
-function connect!(sock::Pipe,path::ByteString)
+function connect!(sock::Pipe, path::ByteString)
     @assert sock.status == StatusInit
     req = c_malloc(_sizeof_uv_connect)
     ccall(:uv_pipe_connect, Void, (Ptr{Void}, Ptr{Void}, Ptr{Uint8}, Ptr{Void}), req, sock.handle, path, uv_jl_connectcb::Ptr{Void})
     sock.status = StatusConnecting
     sock
 end
+connect!(sock::Pipe, path::String) = connect(sock,bytestring(path))
 
 function connect(cb::Function,sock::AsyncStream,args...)
     sock.ccb = cb
@@ -852,6 +853,8 @@ function connect(sock::AsyncStream, args...)
     sock
 end
 
+connect(path::String) = connect(Pipe(),path)
+
 dup(x::RawFD) = RawFD(ccall((@windows? :_dup : :dup),Int32,(Int32,),x.fd))
 dup(src::RawFD,target::RawFD) = systemerror("dup",ccall((@windows? :_dup2 : :dup2),Int32,(Int32,Int32),src.fd,target.fd) == -1)
 
@@ -875,5 +878,3 @@ for (x,writable,unix_fd,c_symbol) in ((:STDIN,false,0,:jl_uv_stdin),(:STDOUT,tru
         end
     end
 end
-
-connect(path::ByteString) = connect(Pipe(),path)