Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubinius/rubinius
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a4bf31efebff
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2b648e9bcff8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 4, 2015

  1. rescue ESPIPE from seek in #reopen when reopening a Pipe FD

    @chuckremes
    chuckremes committed Oct 4, 2015
    Copy the full SHA
    7dc0a01 View commit details

  2. Merge branch 'ffi-io' of https://github.com/rubinius/rubinius into ff… 

    …i-io
    @chuckremes
    chuckremes committed Oct 4, 2015
    Copy the full SHA
    2b648e9 View commit details
Showing with 6 additions and 3 deletions.
  1. +6 −3 kernel/common/io.rb
9 changes: 6 additions & 3 deletions kernel/common/io.rb
View file
Original file line number Diff line number Diff line change
@@ -2804,8 +2804,8 @@ def reopen(other, mode=undefined)
if io.respond_to?(:path)
@path = io.path
end
seek(other.pos, SEEK_SET)

seek(other.pos, SEEK_SET) rescue Errno::ESPIPE
else
flush unless closed?

@@ -2823,7 +2823,10 @@ def reopen(other, mode=undefined)

reopen_path Rubinius::Type.coerce_to_path(other), mode
@fd = FileDescriptor.choose_type(descriptor)
seek 0, SEEK_SET unless closed?

unless closed?
seek(0, SEEK_SET) rescue Errno::ESPIPE
end
end

self