Revert @JeffBezanson's workaround [JuliaLang#2162].

@vtjnash's fix seems to work. Finger's crossed.

---

Revert "try to improve the STDIN as IOStream workaround"

This reverts commit 4e8cabc.

---

Revert "make STDIN an IOStream on linux when the input stream is a file"

This reverts commit 6445178.

base/process.jl

@@ -295,27 +295,13 @@ function spawn(pc::ProcessChainOrNot,cmds::AndCmds,stdios::StdIOSet,exitcb::Call
 end
 
 function reinit_stdio()
- #STDIN.handle = ccall(:jl_stdin_stream ,Ptr{Void},())
- global STDIN
- inhandle = ccall(:jl_stdin_stream, Ptr{Void}, ())
- if inhandle == C_NULL
- STDIN = fdio("",0)
- else
- if !isa(STDIN,AsyncStream)
- STDIN = _uv_tty2tty(inhandle)
- else
- STDIN.handle = inhandle
- STDIN.buffer = PipeBuffer()
- ccall(:jl_uv_associate_julia_struct, Void, (Ptr{Void},Any),
- STDIN.handle, STDIN)
- end
- end
-
+ STDIN.handle = ccall(:jl_stdin_stream ,Ptr{Void},())
  STDOUT.handle = ccall(:jl_stdout_stream,Ptr{Void},())
  STDERR.handle = ccall(:jl_stderr_stream,Ptr{Void},())
+ STDIN.buffer = PipeBuffer()
  STDOUT.buffer = PipeBuffer()
  STDERR.buffer = PipeBuffer()
- for stream in (STDOUT,STDERR)
+ for stream in (STDIN,STDOUT,STDERR)
  ccall(:jl_uv_associate_julia_struct,Void,(Ptr{Void},Any),stream.handle,stream)
  end
 end

base/stream.jl

@@ -75,12 +75,7 @@ end
 
 #macro init_stdio()
 #begin
- inhandle = ccall(:jl_stdin_stream ,Ptr{Void},())
- if inhandle == C_NULL
- STDIN = fdio("",0)
- else
- STDIN = _uv_tty2tty(inhandle)
- end
+ const STDIN = _uv_tty2tty(ccall(:jl_stdin_stream ,Ptr{Void},()))
  const STDOUT = _uv_tty2tty(ccall(:jl_stdout_stream,Ptr{Void},()))
  const STDERR = _uv_tty2tty(ccall(:jl_stderr_stream,Ptr{Void},()))
  OUTPUT_STREAM = STDOUT

src/init.c

@@ -332,10 +332,6 @@ void *init_stdio_handle(uv_file fd,int readable)
  break;
  case UV_NAMED_PIPE:
  case UV_FILE:
-#if defined(__linux__)
- if (readable)
- return NULL;
-#endif
  handle = malloc(sizeof(uv_pipe_t));
  uv_pipe_init(jl_io_loop, (uv_pipe_t*)handle,(readable?UV_PIPE_READABLE:UV_PIPE_WRITEABLE));
  uv_pipe_open((uv_pipe_t*)handle,fd);