fix #3473, readlines of empty file

JuliaLang · Jul 2, 2013 · 42d0954 · 42d0954
1 parent e2ecb0f
commit 42d0954
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/sys.c b/src/sys.c
@@ -65,10 +65,8 @@ DLLEXPORT int jl_ios_eof(ios_t *s)
 {
     if (ios_eof(s))
         return 1;
-    if (s->state == bst_rd) {
-        if (ios_readprep(s, 1) < 1)
-            return 1;
-    }
+    if (ios_readprep(s, 1) < 1)
+        return 1;
     return 0;
 }
 

diff --git a/test/file.jl b/test/file.jl
@@ -119,6 +119,13 @@ test_monitor(0.1)
 # @test isfile(file) == true
 # @test readall(file) == "Here is some text"
 
+emptyfile = joinpath(dir, "empty")
+touch(emptyfile)
+emptyf = open(emptyfile)
+@test isempty(readlines(emptyf))
+close(emptyf)
+rm(emptyfile)
+
 ############
 # Clean up #
 ############

diff --git a/test/iostring.jl b/test/iostring.jl
@@ -115,3 +115,5 @@ skip(io,72)
 @assert takebuf_string(io) == ""
 close(io)
 end
+
+@test isempty(readlines(IOBuffer()))