add positional chomp argument to readline (squashed JuliaLang#19944)

Author: mpastell

NEWS.md

@@ -46,6 +46,9 @@ Breaking changes
 
 This section lists changes that do not have deprecation warnings.
 
+  * `readline`, `readlines` and `eachline` return lines without line endings by default.
+     You can use `readline(s, false)` to get the old behavior and include EOL character(s). ([#19944]).
+
   * `String`s no longer have a `.data` field (as part of a significant performance
     improvement). Use `Vector{UInt8}(str)` to access a string as a byte array.
     However, allocating the `Vector` object has overhead. You can also use

base/LineEdit.jl

@@ -211,7 +211,7 @@ function refresh_multi_line(termbuf::TerminalBuffer, terminal::UnixTerminal, buf
     seek(buf, 0)
     moreinput = true # add a blank line if there is a trailing newline on the last line
     while moreinput
-        l = readline(buf)
+        l = readline(buf, false)
         moreinput = endswith(l, "\n")
         # We need to deal with on-screen characters, so use strwidth to compute occupied columns
         llength = strwidth(l)
@@ -549,7 +549,7 @@ end
 function edit_kill_line(s::MIState)
     buf = buffer(s)
     pos = position(buf)
-    killbuf = readline(buf)
+    killbuf = readline(buf, false)
     if length(killbuf) > 1 && killbuf[end] == '\n'
         killbuf = killbuf[1:end-1]
         char_move_left(buf)

base/REPL.jl

@@ -205,7 +205,7 @@ function run_frontend(repl::BasicREPL, backend::REPLBackendRef)
         interrupted = false
         while true
             try
-                line *= readline(repl.terminal)
+                line *= readline(repl.terminal, false)
             catch e
                 if isa(e,InterruptException)
                     try # raise the debugger if present
@@ -337,7 +337,7 @@ An editor may have converted tabs to spaces at line """
 
 function hist_getline(file)
     while !eof(file)
-        line = readline(file)
+        line = readline(file, false)
         isempty(line) && return line
         line[1] in "\r\n" || return line
     end
@@ -995,7 +995,7 @@ function run_frontend(repl::StreamREPL, backend::REPLBackendRef)
         if have_color
             print(repl.stream, input_color(repl))
         end
-        line = readline(repl.stream)
+        line = readline(repl.stream, false)
         if !isempty(line)
             ast = Base.parse_input_line(line)
             if have_color

base/client.jl

@@ -216,7 +216,7 @@ parse_input_line(s::AbstractString) = parse_input_line(String(s))
 function parse_input_line(io::IO)
     s = ""
     while !eof(io)
-        s = s*readline(io)
+        s = s*readline(io, false)
         e = parse_input_line(s)
         if !(isa(e,Expr) && e.head === :incomplete)
             return e

base/io.jl

@@ -170,24 +170,53 @@ The text is assumed to be encoded in UTF-8.
 readuntil(filename::AbstractString, args...) = open(io->readuntil(io, args...), filename)
 
 """
-    readline(stream::IO=STDIN)
-    readline(filename::AbstractString)
+    readline()
+    readline(stream, chomp::Bool=true)
+    readline(filename::AbstractString, chomp::Bool=true)
 
-Read a single line of text, including a trailing newline character (if one is reached before
-the end of the input), from the given I/O stream or file (defaults to `STDIN`).
-When reading from a file, the text is assumed to be encoded in UTF-8.
+Read a single line of text from the given I/O stream or file (defaults to `STDIN`).
+Lines in the input can end in `'\\n'` or `"\\r\\n"`. When reading from a file, the text is
+assumed to be encoded in UTF-8.
+
+If `chomp=false` trailing newline character(s) will be included in the output
+(if reached before the end of the input); otherwise newline characters(s)
+are stripped from result.
 """
-readline(filename::AbstractString) = open(readline, filename)
+function readline(filename::AbstractString, chomp::Bool=true)
+    open(filename) do f
+          readline(f, chomp)
+    end
+end
+readline() = readline(STDIN, false)
+
+function readline(s::IO, chomp::Bool=true)
+    line = readuntil(s, 0x0a)
+    i = length(line)
+    if !chomp || i == 0 || line[i] != 0x0a
+        return String(line)
+    elseif i < 2 || line[i-1] != 0x0d
+        return String(resize!(line,i-1))
+    else
+        return String(resize!(line,i-2))
+    end
+end
 
 """
-    readlines(stream::IO)
-    readlines(filename::AbstractString)
+    readlines(stream::IO, chomp::Bool=true)
+    readlines(filename::AbstractString, chomp::Bool=true)
 
 Read all lines of an I/O stream or a file as a vector of strings.
+Lines in the input can end in `'\\n'` or `"\\r\\n"`.
 The text is assumed to be encoded in UTF-8.
-"""
-readlines(filename::AbstractString) = open(readlines, filename)
 
+If `chomp=false` trailing newline character(s) will be included in the output;
+otherwise newline characters(s) are stripped from result.
+"""
+function readlines(filename::AbstractString, chomp::Bool=true)
+    open(filename) do f
+        readlines(f, chomp)
+    end
+end
 
 ## byte-order mark, ntoh & hton ##
 
@@ -454,9 +483,6 @@ function readuntil(s::IO, t::AbstractString)
     return String(take!(out))
 end
 
-readline() = readline(STDIN)
-readline(s::IO) = readuntil(s, '\n')
-
 """
     readchomp(x)
 
@@ -519,22 +545,28 @@ readstring(filename::AbstractString) = open(readstring, filename)
 
 type EachLine
     stream::IO
+    chomp::Bool
     ondone::Function
-    EachLine(stream) = EachLine(stream, ()->nothing)
-    EachLine(stream, ondone) = new(stream, ondone)
+    EachLine(stream, chomp) = EachLine(stream, chomp, ()->nothing)
+    EachLine(stream, chomp, ondone) = new(stream, chomp, ondone)
 end
 
 """
-    eachline(stream::IO)
-    eachline(filename::AbstractString)
+    eachline(stream::IO,  chomp::Bool=true)
+    eachline(filename::AbstractString,  chomp::Bool=true)
 
 Create an iterable object that will yield each line from an I/O stream or a file.
+Lines in the input can end in `'\\n'` or `"\\r\\n"`.
 The text is assumed to be encoded in UTF-8.
+
+If `chomp=false` trailing newline character(s) will be included in the output;
+otherwise newline characters(s) are stripped from result.
 """
-eachline(stream::IO) = EachLine(stream)
-function eachline(filename::AbstractString)
+eachline(stream::IO, chomp::Bool=true) = EachLine(stream, chomp)
+
+function eachline(filename::AbstractString, chomp::Bool=true)
     s = open(filename)
-    EachLine(s, ()->close(s))
+    EachLine(s, chomp, ()->close(s))
 end
 
 start(itr::EachLine) = nothing
@@ -545,10 +577,11 @@ function done(itr::EachLine, nada)
     itr.ondone()
     true
 end
-next(itr::EachLine, nada) = (readline(itr.stream), nothing)
+
+next(itr::EachLine, nada) = (readline(itr.stream, itr.chomp), nothing)
 eltype(::Type{EachLine}) = String
 
-readlines(s=STDIN) = collect(eachline(s))
+readlines(s::IO, chomp::Bool=true) = collect(eachline(s, chomp))
 
 iteratorsize(::Type{EachLine}) = SizeUnknown()
 

base/iostream.jl

@@ -222,16 +222,16 @@ take!(s::IOStream) =
     ccall(:jl_take_buffer, Vector{UInt8}, (Ptr{Void},), s.ios)
 
 function readuntil(s::IOStream, delim::UInt8)
-    ccall(:jl_readuntil, Array{UInt8,1}, (Ptr{Void}, UInt8, UInt8), s.ios, delim, 0)
+    ccall(:jl_readuntil, Array{UInt8,1}, (Ptr{Void}, UInt8, UInt8, UInt8), s.ios, delim, 0, 0)
 end
 
 # like readuntil, above, but returns a String without requiring a copy
 function readuntil_string(s::IOStream, delim::UInt8)
-    ccall(:jl_readuntil, Ref{String}, (Ptr{Void}, UInt8, UInt8), s.ios, delim, 1)
+    ccall(:jl_readuntil, Ref{String}, (Ptr{Void}, UInt8, UInt8, UInt8), s.ios, delim, 1, false)
 end
 
-function readline(s::IOStream)
-    ccall(:jl_readuntil, Ref{String}, (Ptr{Void}, UInt8, UInt8), s.ios, '\n', 1)
+function readline(s::IOStream, chomp::Bool=true)
+    ccall(:jl_readuntil, Ref{String}, (Ptr{Void}, UInt8, UInt8, UInt8), s.ios, '\n', 1, chomp)
 end
 
 function readbytes_all!(s::IOStream, b::Array{UInt8}, nb)
@@ -325,7 +325,7 @@ function skipchars(s::IOStream, pred; linecomment::Char=Char(0xffffffff))
     ch = peekchar(s); status = Int(ch)
     while status >= 0 && (pred(ch) || ch == linecomment)
         if ch == linecomment
-            readline(s)
+            readline(s, false)
         else
             read(s, Char)  # advance one character
         end

base/libgit2/callbacks.jl

@@ -99,7 +99,7 @@ function authenticate_ssh(creds::SSHCredentials, libgit2credptr::Ptr{Ptr{Void}},
         else
             # In encrypted private keys, the second line is "Proc-Type: 4,ENCRYPTED"
             open(privatekey) do f
-                passphrase_required = (readline(f); chomp(readline(f)) == "Proc-Type: 4,ENCRYPTED")
+                passphrase_required = (readline(f, false); readline(f) == "Proc-Type: 4,ENCRYPTED")
             end
         end
 

base/libgit2/utils.jl

@@ -31,7 +31,7 @@ function prompt(msg::AbstractString; default::AbstractString="", password::Bool=
         Base.getpass(msg)
     else
         print(msg)
-        chomp(readline(STDIN))
+        readline(STDIN)
     end
     isempty(uinput) ? default : uinput
 end

base/markdown/Common/block.jl

@@ -61,7 +61,7 @@ function hashheader(stream::IO, md::MD)
             return false
 
         if c != '\n' # Empty header
-            h = readline(stream) |> strip
+            h = readline(stream, false) |> strip
             h = match(r"(.*?)( +#+)?$", h).captures[1]
             buffer = IOBuffer()
             print(buffer, h)
@@ -76,11 +76,11 @@ end
 function setextheader(stream::IO, md::MD)
     withstream(stream) do
         eatindent(stream) || return false
-        header = readline(stream) |> strip
+        header = readline(stream, false) |> strip
         header == "" && return false
 
         eatindent(stream) || return false
-        underline = readline(stream) |> strip
+        underline = readline(stream, false) |> strip
         length(underline) < 3 && return false
         u = underline[1]
         u in "-=" || return false
@@ -108,7 +108,7 @@ function indentcode(stream::IO, block::MD)
         buffer = IOBuffer()
         while !eof(stream)
             if startswith(stream, "    ") || startswith(stream, "\t")
-                write(buffer, readline(stream))
+                write(buffer, readline(stream, false))
             elseif blankline(stream)
                 write(buffer, '\n')
             else
@@ -139,10 +139,10 @@ function footnote(stream::IO, block::MD)
         else
             ref = match(regex, str).captures[1]
             buffer = IOBuffer()
-            write(buffer, readline(stream))
+            write(buffer, readline(stream, false))
             while !eof(stream)
                 if startswith(stream, "    ")
-                    write(buffer, readline(stream))
+                    write(buffer, readline(stream, false))
                 elseif blankline(stream)
                     write(buffer, '\n')
                 else
@@ -174,7 +174,7 @@ function blockquote(stream::IO, block::MD)
         empty = true
         while eatindent(stream) && startswith(stream, '>')
             startswith(stream, " ")
-            write(buffer, readline(stream))
+            write(buffer, readline(stream, false))
             empty = false
         end
         empty && return false
@@ -210,7 +210,7 @@ function admonition(stream::IO, block::MD)
         category, title =
             let untitled = r"^([a-z]+)$",          # !!! <CATEGORY_NAME>
                 titled   = r"^([a-z]+) \"(.*)\"$", # !!! <CATEGORY_NAME> "<TITLE>"
-                line     = strip(readline(stream))
+                line     = strip(readline(stream, false))
                 if ismatch(untitled, line)
                     m = match(untitled, line)
                     # When no title is provided we use CATEGORY_NAME, capitalising it.
@@ -229,7 +229,7 @@ function admonition(stream::IO, block::MD)
         buffer = IOBuffer()
         while !eof(stream)
             if startswith(stream, "    ")
-                write(buffer, readline(stream))
+                write(buffer, readline(stream, false))
             elseif blankline(stream)
                 write(buffer, '\n')
             else
@@ -305,7 +305,7 @@ function list(stream::IO, block::MD)
                 newline = false
                 if startswith(stream, " "^indent)
                     # Indented text that is part of the current list item.
-                    print(buffer, readline(stream))
+                    print(buffer, readline(stream, false))
                 else
                     matched = startswith(stream, regex)
                     if isempty(matched)
@@ -316,7 +316,7 @@ function list(stream::IO, block::MD)
                         # Start of a new list item.
                         count += 1
                         count > 1 && pushitem!(list, buffer)
-                        print(buffer, readline(stream))
+                        print(buffer, readline(stream, false))
                     end
                 end
             end

base/markdown/GitHub/GitHub.jl

@@ -8,7 +8,7 @@ function fencedcode(stream::IO, block::MD)
         startswith(stream, "~~~", padding = true) || startswith(stream, "```", padding = true) || return false
         skip(stream, -1)
         ch = read(stream, Char)
-        trailing = strip(readline(stream))
+        trailing = strip(readline(stream, false))
         flavor = lstrip(trailing, ch)
         n = 3 + length(trailing) - length(flavor)
 
@@ -30,7 +30,7 @@ function fencedcode(stream::IO, block::MD)
                     seek(stream, line_start)
                 end
             end
-            write(buffer, readline(stream))
+            write(buffer, readline(stream, false))
         end
         return false
     end

base/markdown/GitHub/table.jl

@@ -7,7 +7,7 @@ end
 
 function parserow(stream::IO)
     withstream(stream) do
-        line = readline(stream) |> chomp
+        line = readline(stream)
         row = split(line, r"(?<!\\)\|")
         length(row) == 1 && return
         row[1] == "" && shift!(row)

base/markdown/parse/util.jl

@@ -46,7 +46,7 @@ function linecontains(io::IO, chars; allow_whitespace = true,
                                      eat = true,
                                      allowempty = false)
     start = position(io)
-    l = readline(io) |> chomp
+    l = readline(io)
     length(l) == 0 && return allowempty
 
     result = allowempty
@@ -99,7 +99,7 @@ function startswith(stream::IO, r::Regex; eat = true, padding = false)
     @assert Base.startswith(r.pattern, "^")
     start = position(stream)
     padding && skipwhitespace(stream)
-    line = chomp(readline(stream))
+    line = readline(stream)
     seek(stream, start)
     m = match(r, line)
     m === nothing && return ""

base/multi.jl

@@ -1624,7 +1624,7 @@ end
 
 function redirect_worker_output(ident, stream)
     @schedule while !eof(stream)
-        line = readline(stream)
+        line = readline(stream, false)
         if startswith(line, "\tFrom worker ")
             # STDOUT's of "additional" workers started from an initial worker on a host are not available
             # on the master directly - they are routed via the initial worker's STDOUT.
@@ -1642,7 +1642,7 @@ end
 # setup a all-to-all network.
 function read_worker_host_port(io::IO)
     while true
-        conninfo = readline(io)
+        conninfo = readline(io, false)
         bind_addr, port = parse_connection_info(conninfo)
         if bind_addr != ""
             return bind_addr, port

base/pkg/dir.jl

@@ -67,7 +67,7 @@ end
 
 function getmetabranch()
     try
-        chomp(readline(joinpath(path(),"META_BRANCH")))
+        readline(joinpath(path(),"META_BRANCH"))
     catch err
         META_BRANCH
     end

base/pkg/entry.jl

@@ -608,7 +608,7 @@ function build!(pkgs::Vector, errs::Dict, seen::Set=Set())
         empty!(Base.DL_LOAD_PATH)
         append!(Base.DL_LOAD_PATH, $(repr(Base.DL_LOAD_PATH)))
         open("$(escape_string(errfile))", "a") do f
-            for path_ in eachline(STDIN)
+            for path_ in eachline(STDIN, false)
                 path = chomp(path_)
                 pkg = basename(dirname(dirname(path)))
                 try

base/pkg/reqs.jl

@@ -66,7 +66,6 @@ end
 function read(readable::Union{IO,Base.AbstractCmd})
     lines = Line[]
     for line in eachline(readable)
-        line = chomp(line)
         push!(lines, ismatch(r"^\s*(?:#|$)", line) ? Comment(line) : Requirement(line))
     end
     return lines

base/precompile.jl

@@ -322,7 +322,9 @@ precompile(Base.read, (Base.Terminals.TTYTerminal, Type{Char}))
 precompile(Base.read, (IOBuffer, Type{Char}))
 precompile(Base.read, (IOBuffer, Type{UInt8}))
 precompile(Base.read, (IOStream, Array{UInt32,1}))
-precompile(Base.readline, (String,))
+precompile(Base.readline, (String, Bool))
+precompile(Base.readline, (IOBuffer, Bool))
+precompile(Base.readline, (IOStream, Bool))
 precompile(Base.readuntil, (IOBuffer, Char))
 precompile(Base.readuntil, (IOBuffer, UInt8))
 precompile(Base.rehash!, (Dict{Any,Any}, Int))

base/process.jl

@@ -561,7 +561,7 @@ function eachline(cmd::AbstractCmd, stdin)
     close(stdout.in)
     out = stdout.out
     # implicitly close after reading lines, since we opened
-    return EachLine(out, ()->(close(out); success(processes) || pipeline_error(processes)))
+    return EachLine(out, false, ()->(close(out); success(processes) || pipeline_error(processes)))
 end
 eachline(cmd::AbstractCmd) = eachline(cmd, DevNull)
 

contrib/add_license_to_files.jl

@@ -135,7 +135,7 @@ function add_license_line!(unprocessed::Vector, src::AbstractString, new_license
             if ext in keys(ext_prefix)
                 prefix = ext_prefix[ext]
                 f = open(path, "r")
-                lines = readlines(f)
+                lines = readlines(f, false)
                 close(f)
                 isempty(lines) && (push!(unprocessed, path); continue)
                 isempty(old_license) || check_lines!(path, lines, old_license, prefix, true)

examples/clustermanager/0mq/ZMQCM.jl

@@ -270,7 +270,7 @@ end
 
 function print_worker_stdout(io, pid)
     @schedule while !eof(io)
-        line = readline(io)
+        line = readline(io, false)
         print("\tFrom worker $(pid):\t$line")
     end
 end

examples/clustermanager/simple/UnixDomainCM.jl

@@ -81,7 +81,7 @@ end
 
 function print_worker_stdout(io, pid)
     @schedule while !eof(io)
-        line = readline(io)
+        line = readline(io, false)
         print("\tFrom worker $(pid):\t$line")
     end
 end

src/flisp/iostream.c

@@ -333,7 +333,7 @@ value_t fl_ioreaduntil(fl_context_t *fl_ctx, value_t *args, uint32_t nargs)
     ios_setbuf(&dest, data, 80, 0);
     char delim = get_delim_arg(fl_ctx, args[1], "io.readuntil");
     ios_t *src = toiostream(fl_ctx, args[0], "io.readuntil");
-    size_t n = ios_copyuntil(&dest, src, delim);
+    size_t n = ios_copyuntil(&dest, src, delim, 0);
     cv->len = n;
     if (dest.buf != data) {
         // outgrew initial space
@@ -352,7 +352,7 @@ value_t fl_iocopyuntil(fl_context_t *fl_ctx, value_t *args, uint32_t nargs)
     ios_t *dest = toiostream(fl_ctx, args[0], "io.copyuntil");
     ios_t *src = toiostream(fl_ctx, args[1], "io.copyuntil");
     char delim = get_delim_arg(fl_ctx, args[2], "io.copyuntil");
-    return size_wrap(fl_ctx, ios_copyuntil(dest, src, delim));
+    return size_wrap(fl_ctx, ios_copyuntil(dest, src, delim, 0));
 }
 
 value_t fl_iocopy(fl_context_t *fl_ctx, value_t *args, uint32_t nargs)

src/gen_sysimg_symtab.jl

@@ -21,7 +21,7 @@ function outputline(io, line)
     println(io, "jl_symbol(\"", row[2], "\"),")
 end
 
-lines = eachline(io)
+lines = eachline(io, false)
 
 open(f->foreach(l->outputline(f,l), take(lines,63)), "common_symbols1.inc", "w")
 open(f->foreach(l->outputline(f,l), lines), "common_symbols2.inc", "w")

src/support/ios.c

@@ -802,7 +802,7 @@ size_t ios_copyall(ios_t *to, ios_t *from)
 
 #define LINE_CHUNK_SIZE 160
 
-size_t ios_copyuntil(ios_t *to, ios_t *from, char delim)
+size_t ios_copyuntil(ios_t *to, ios_t *from, char delim, uint8_t chomp)
 {
     size_t total = 0, avail = (size_t)(from->size - from->bpos);
     while (!ios_eof(from)) {
@@ -821,7 +821,11 @@ size_t ios_copyuntil(ios_t *to, ios_t *from, char delim)
         }
         else {
             size_t ntowrite = pd - (from->buf+from->bpos) + 1;
-            written = ios_write(to, from->buf+from->bpos, ntowrite);
+            size_t nchomp = 0;
+            if (chomp) {
+                nchomp = ios_nchomp(from, ntowrite);
+            }
+            written = ios_write(to, from->buf+from->bpos, ntowrite - nchomp);
             from->bpos += ntowrite;
             total += written;
             return total;
@@ -831,6 +835,19 @@ size_t ios_copyuntil(ios_t *to, ios_t *from, char delim)
     return total;
 }
 
+size_t ios_nchomp(ios_t *from, size_t ntowrite)
+{
+    assert(ntowrite > 0);
+    size_t nchomp;
+    if (ntowrite > 1 && from->buf[from->bpos+ntowrite - 2] == '\r') {
+        nchomp = 2;
+    }
+    else {
+        nchomp = 1;
+    }
+    return nchomp;
+}
+
 static void _ios_init(ios_t *s)
 {
     // put all fields in a sane initial state
@@ -1135,7 +1152,7 @@ char *ios_readline(ios_t *s)
 {
     ios_t dest;
     ios_mem(&dest, 0);
-    ios_copyuntil(&dest, s, '\n');
+    ios_copyuntil(&dest, s, '\n', 0);
     size_t n;
     return ios_take_buffer(&dest, &n);
 }

src/support/ios.h

@@ -94,7 +94,8 @@ JL_DLLEXPORT int ios_get_writable(ios_t *s);
 JL_DLLEXPORT void ios_set_readonly(ios_t *s);
 JL_DLLEXPORT size_t ios_copy(ios_t *to, ios_t *from, size_t nbytes);
 JL_DLLEXPORT size_t ios_copyall(ios_t *to, ios_t *from);
-JL_DLLEXPORT size_t ios_copyuntil(ios_t *to, ios_t *from, char delim);
+JL_DLLEXPORT size_t ios_copyuntil(ios_t *to, ios_t *from, char delim, uint8_t chomp);
+JL_DLLEXPORT size_t ios_nchomp(ios_t *from, size_t ntowrite);
 // ensure at least n bytes are buffered if possible. returns # available.
 JL_DLLEXPORT size_t ios_readprep(ios_t *from, size_t n);
 

src/sys.c

@@ -250,15 +250,19 @@ JL_DLLEXPORT jl_array_t *jl_take_buffer(ios_t *s)
     return a;
 }
 
-JL_DLLEXPORT jl_value_t *jl_readuntil(ios_t *s, uint8_t delim, uint8_t str)
+JL_DLLEXPORT jl_value_t *jl_readuntil(ios_t *s, uint8_t delim, uint8_t str, uint8_t chomp)
 {
     jl_array_t *a;
     // manually inlined common case
     char *pd = (char*)memchr(s->buf+s->bpos, delim, (size_t)(s->size - s->bpos));
     if (pd) {
         size_t n = pd-(s->buf+s->bpos)+1;
         if (str) {
-            jl_value_t *str = jl_pchar_to_string(s->buf + s->bpos, n);
+            size_t nchomp = 0;
+            if (chomp) {
+                nchomp = ios_nchomp(s, n);
+            }
+            jl_value_t *str = jl_pchar_to_string(s->buf + s->bpos, n - nchomp);
             s->bpos += n;
             return str;
         }
@@ -271,7 +275,7 @@ JL_DLLEXPORT jl_value_t *jl_readuntil(ios_t *s, uint8_t delim, uint8_t str)
         ios_t dest;
         ios_mem(&dest, 0);
         ios_setbuf(&dest, (char*)a->data, 80, 0);
-        size_t n = ios_copyuntil(&dest, s, delim);
+        size_t n = ios_copyuntil(&dest, s, delim, chomp);
         if (dest.buf != a->data) {
             a = jl_take_buffer(&dest);
         }

test/file.jl

@@ -277,15 +277,15 @@ write(s, "Goodbye world!\n")
 close(s)
 s = open(file)
 mark(s)
-str = readline(s)
+str = readline(s, false)
 @test startswith(str, "Marked!")
 @test ismarked(s)
 reset(s)
 @test !ismarked(s)
-str = readline(s)
+str = readline(s, false)
 @test startswith(str, "Marked!")
 mark(s)
-@test readline(s) == "Hello world!\n"
+@test readline(s, false) == "Hello world!\n"
 @test ismarked(s)
 unmark(s)
 @test !ismarked(s)
@@ -335,7 +335,7 @@ end
 emptyfile = joinpath(dir, "empty")
 touch(emptyfile)
 emptyf = open(emptyfile)
-@test isempty(readlines(emptyf))
+@test isempty(readlines(emptyf, false))
 close(emptyf)
 rm(emptyfile)
 

test/iobuffer.jl

@@ -49,7 +49,7 @@ end
 
 let io = IOBuffer("hamster\nguinea pig\nturtle")
 @test position(io) == 0
-@test readline(io) == "hamster\n"
+@test readline(io, false) == "hamster\n"
 @test readstring(io) == "guinea pig\nturtle"
 @test_throws EOFError read(io,UInt8)
 seek(io,0)
@@ -66,14 +66,28 @@ let io = PipeBuffer()
 @test_throws EOFError read(io,UInt8)
 @test write(io,"pancakes\nwaffles\nblueberries\n") > 0
 @test position(io) == 0
-@test readline(io) == "pancakes\n"
+@test readline(io, false) == "pancakes\n"
 Base.compact(io)
-@test readline(io) == "waffles\n"
+@test readline(io, false) == "waffles\n"
 @test write(io,"whipped cream\n") > 0
-@test readline(io) == "blueberries\n"
+@test readline(io, false) == "blueberries\n"
 @test_throws ArgumentError seek(io,0)
 @test_throws ArgumentError truncate(io,0)
-@test readline(io) == "whipped cream\n"
+@test readline(io, false) == "whipped cream\n"
+@test write(io,"pancakes\nwaffles\nblueberries\n") > 0
+@test readlines(io, true) == String["pancakes", "waffles", "blueberries"]
+write(io,"\n\r\n\n\r \n") > 0
+@test readlines(io, false) == String["\n", "\r\n", "\n", "\r \n"]
+write(io,"\n\r\n\n\r \n") > 0
+@test readlines(io, true) == String["", "", "", "\r "]
+@test write(io,"α\nβ\nγ\nδ") > 0
+@test readlines(io, true) == String["α", "β", "γ", "δ"]
+@test write(io,"α\nβ\nγ\nδ") > 0
+@test readlines(io, false) == String["α\n","β\n","γ\n","δ"]
+@test readlines(IOBuffer(""), false) == []
+@test readlines(IOBuffer(""), true) == []
+@test readlines(IOBuffer("first\nsecond"), false) == String["first\n", "second"]
+@test readlines(IOBuffer("first\nsecond"), true) == String["first", "second"]
 Base.compact(io)
 @test position(io) == 0
 @test ioslength(io) == 0
@@ -133,7 +147,7 @@ a = Array{UInt8}(1024)
 @test eof(io)
 end
 
-@test isempty(readlines(IOBuffer()))
+@test isempty(readlines(IOBuffer(), false))
 
 # issue #8193
 let io=IOBuffer("asdf")

test/iterators.jl

@@ -27,7 +27,7 @@ end
 
 # enumerate (issue #6284)
 let b = IOBuffer("1\n2\n3\n"), a = []
-    for (i,x) in enumerate(eachline(b))
+    for (i,x) in enumerate(eachline(b, false))
         push!(a, (i,x))
     end
     @test a == [(1,"1\n"),(2,"2\n"),(3,"3\n")]
@@ -37,7 +37,7 @@ end
 let zeb = IOBuffer("1\n2\n3\n4\n5\n"),
     letters = ['a', 'b', 'c', 'd', 'e'],
     res     = []
-    for (number, letter) in zip(eachline(zeb), letters)
+    for (number, letter) in zip(eachline(zeb, false), letters)
         push!(res, (parse(Int,strip(number)), letter))
     end
     @test res == [(1, 'a'), (2, 'b'), (3, 'c'), (4, 'd'), (5, 'e')]

test/mmap.jl

@@ -130,7 +130,7 @@ c[5] = UInt8('x')
 Mmap.sync!(c)
 close(s)
 s = open(file, "r")
-str = readline(s)
+str = readline(s, false)
 close(s)
 @test startswith(str, "Hellx World")
 finalize(c); c=nothing; gc()

test/perf/kernel/actor_centrality.jl

@@ -43,7 +43,7 @@ function read_graph()
 
     open(joinpath(@__DIR__, "imdb-1.tsv"), "r") do io
         while !eof(io)
-            k = split(strip(readline(io)), "\t")
+            k = split(strip(readline(io), false), "\t")
             actor, movie = k[1], join(k[2:3], "_")
             ac, mn = get(G, actor), get(G, movie)
             push!(actors, actor)

test/perf/kernel/perf.jl

@@ -105,7 +105,7 @@ d = randn(len)
 writecsv("random.csv", rand(100000,4))
 
 function parsecsv()
-    for line in EachLine(open("random.csv"))
+    for line in eachline("random.csv", false)
         split(line, ',')
     end
 end

test/perf/perfcomp.jl

@@ -7,7 +7,7 @@
 # The file format is the output of running `make` in this directory.
 
 function readperf(f)
-    Dict(rstrip(l[1:19])=>[parse(Float64,l[20:27]),parse(Float64,l[29:36]),parse(Float64,l[38:45]),parse(Float64,l[47:54])] for l in eachline(f))
+    Dict(rstrip(l[1:19])=>[parse(Float64,l[20:27]),parse(Float64,l[29:36]),parse(Float64,l[38:45]),parse(Float64,l[47:54])] for l in eachline(f, false))
 end
 
 function main()

test/perf/shootout/k_nucleotide.jl

@@ -64,7 +64,7 @@ function k_nucleotide(infile="knucleotide-input.txt")
     input = open(infile, "r")
     three = ">THREE "
     while true
-        line = readline(input)
+        line = readline(input, false)
         if length(line) >= length(three) && line[1:length(three)] == three
             break
         end

test/read.jl

@@ -241,12 +241,16 @@ for (name, f) in l
         cleanup()
 
         verbose && println("$name readline...")
-        @test readline(io()) == readline(IOBuffer(text))
-        @test readline(io()) == readline(filename)
+        @test readline(io(), false) == readline(IOBuffer(text), false)
+        @test readline(io(), false) == readline(filename, false)
 
         verbose && println("$name readlines...")
+        @test readlines(io(), false) == readlines(IOBuffer(text), false)
+        @test readlines(io(), false) == readlines(filename, false)
         @test readlines(io()) == readlines(IOBuffer(text))
         @test readlines(io()) == readlines(filename)
+        @test collect(eachline(io(), false)) == collect(eachline(IOBuffer(text), false))
+        @test collect(eachline(io(), false)) == collect(eachline(filename, false))
         @test collect(eachline(io())) == collect(eachline(IOBuffer(text)))
         @test collect(eachline(io())) == collect(eachline(filename))
 
@@ -271,13 +275,13 @@ for (name, f) in l
 
         verbose && println("$name seek...")
         for n = 0:length(text)-1
-            @test readlines(seek(io(), n)) == readlines(seek(IOBuffer(text), n))
+            @test readlines(seek(io(), n), false) == readlines(seek(IOBuffer(text), n), false)
             cleanup()
         end
         verbose && println("$name skip...")
         for n = 0:length(text)-1
-            @test readlines(seek(io(), n)) == readlines(seek(IOBuffer(text), n))
-            @test readlines(skip(io(), n)) == readlines(skip(IOBuffer(text), n))
+            @test readlines(seek(io(), n), false) == readlines(seek(IOBuffer(text), n), false)
+            @test readlines(skip(io(), n), false) == readlines(skip(IOBuffer(text), n), false)
             cleanup()
         end
         verbose && println("$name seekend...")

test/repl.jl

@@ -103,7 +103,7 @@ if !is_windows() || Sys.windows_version() >= Sys.WINDOWS_VISTA_VER
     # Test that accepting a REPL result immediately shows up, not
     # just on the next keystroke
     write(stdin_write, "1+1\n") # populate history with a trivial input
-    readline(stdout_read)
+    readline(stdout_read, false)
     write(stdin_write, "\e[A\n")
     t = Timer(10) do t
         isopen(t) || return
@@ -116,19 +116,19 @@ if !is_windows() || Sys.windows_version() >= Sys.WINDOWS_VISTA_VER
     # Issue #10222
     # Test ignoring insert key in standard and prefix search modes
     write(stdin_write, "\e[2h\e[2h\n") # insert (VT100-style)
-    @test search(readline(stdout_read), "[2h") == 0:-1
-    readline(stdout_read)
+    @test search(readline(stdout_read, false), "[2h") == 0:-1
+    readline(stdout_read, false)
     write(stdin_write, "\e[2~\e[2~\n") # insert (VT220-style)
-    @test search(readline(stdout_read), "[2~") == 0:-1
-    readline(stdout_read)
+    @test search(readline(stdout_read, false), "[2~") == 0:-1
+    readline(stdout_read, false)
     write(stdin_write, "1+1\n") # populate history with a trivial input
-    readline(stdout_read)
+    readline(stdout_read, false)
     write(stdin_write, "\e[A\e[2h\n") # up arrow, insert (VT100-style)
-    readline(stdout_read)
-    readline(stdout_read)
+    readline(stdout_read, false)
+    readline(stdout_read, false)
     write(stdin_write, "\e[A\e[2~\n") # up arrow, insert (VT220-style)
-    readline(stdout_read)
-    readline(stdout_read)
+    readline(stdout_read, false)
+    readline(stdout_read, false)
 
     # Test down arrow to go back to history
     # populate history with a trivial input

test/spawn.jl

@@ -182,18 +182,18 @@ let r, t, sock
     sock = connect(fetch(r))
     mark(sock)
     @test ismarked(sock)
-    @test readline(sock) == "Hello, world!\n"
-    @test readline(sock) == "Goodbye, world...\n"
+    @test readline(sock, false) == "Hello, world!\n"
+    @test readline(sock, false) == "Goodbye, world...\n"
     @test reset(sock) == 0
     @test !ismarked(sock)
     mark(sock)
     @test ismarked(sock)
-    @test readline(sock) == "Hello, world!\n"
+    @test readline(sock, false) == "Hello, world!\n"
     unmark(sock)
     @test !ismarked(sock)
     @test_throws ArgumentError reset(sock)
     @test !unmark(sock)
-    @test readline(sock) == "Goodbye, world...\n"
+    @test readline(sock) == "Goodbye, world..."
     #@test eof(sock) ## doesn't work
     close(sock)
     @test wait(t)
@@ -316,8 +316,8 @@ let out = Pipe(), echo = `$exename --startup-file=no -e 'print(STDOUT, " 1\t", r
     @test c == read!(out, c)
     Base.wait_readnb(out, 1)
     @test nb_available(out) > 0
-    ln1 = readline(out)
-    ln2 = readline(out)
+    ln1 = readline(out, false)
+    ln2 = readline(out, false)
     desc = readstring(out)
     @test !isreadable(out)
     @test !iswritable(out)
@@ -345,7 +345,7 @@ let fname = tempname()
             cmd = pipeline(`busybox echo asdf`,`busybox cat`)
         end
     end
-    for line in eachline(STDIN)
+    for line in eachline(STDIN, false)
         run(cmd)
     end
     """