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: 0cb72dfc381c
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f5128a67953d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 30, 2015

  1. Copy the full SHA
    e9f9e3b View commit details
  2. Copy the full SHA
    f5128a6 View commit details
Showing with 6 additions and 6 deletions.
  1. +5 −5 kernel/common/io.rb
  2. +1 −1 kernel/common/stat.rb
10 changes: 5 additions & 5 deletions kernel/common/io.rb
Original file line number Diff line number Diff line change
@@ -527,13 +527,13 @@ def initialize(fd, mode)
end
end # class PipeFileDescriptor

def new_pipe(fd, io, external, internal, options, mode)
def new_pipe(fd, external, internal, options, mode)
@fd = PipeFileDescriptor.new(fd, mode)
@lineno = 0
@pipe = true

if external || internal
io.set_encoding(external || Encoding.default_external,
set_encoding(external || Encoding.default_external,
internal || Encoding.default_internal, options)
end

@@ -982,9 +982,9 @@ def self.pipe(external=nil, internal=nil, options=nil)
# backward compatible. <sigh>
fd0, fd1 = PipeFileDescriptor.connect_pipe_fds
lhs = allocate
lhs.send(:new_pipe, fd0, self, external, internal, options, FileDescriptor::O_RDONLY)
lhs.send(:new_pipe, fd0, external, internal, options, FileDescriptor::O_RDONLY)
rhs = allocate
rhs.send(:new_pipe, fd1, self, nil, nil, nil, FileDescriptor::O_WRONLY)
rhs.send(:new_pipe, fd1, nil, nil, nil, FileDescriptor::O_WRONLY)

if block_given?
begin
2 changes: 1 addition & 1 deletion kernel/common/stat.rb
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ def self.stat(path)
def self.fstat(fd)
stat = allocate
result = Rubinius.privately { stat.fsetup fd }
Errno.handle "file descriptor #{descriptor}" unless result == 0
Errno.handle "file descriptor #{fd}" unless result == 0
stat
end