Skip to content

Fix Crystal::System::FileDescriptor to use @fd ivar directly #6703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RX14 merged 2 commits into from
Sep 12, 2018
Merged

Fix Crystal::System::FileDescriptor to use @fd ivar directly #6703

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c12430
Fix Crystal::System::FileDescriptor to use @fd ivar directly
straight-shoota Aug 9, 2018
44552d5
fixup! Fix Crystal::System::FileDescriptor to use @fd ivar directly
straight-shoota Sep 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/crystal/system/unix/file_descriptor.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,19 @@ module Crystal::System::FileDescriptor
end

private def system_tty?
LibC.isatty(fd) == 1
LibC.isatty(@fd) == 1
end

private def system_reopen(other : IO::FileDescriptor)
{% if LibC.methods.includes? "dup3".id %}
# dup doesn't copy the CLOEXEC flag, so copy it manually using dup3
flags = other.close_on_exec? ? LibC::O_CLOEXEC : 0
if LibC.dup3(other.fd, self.fd, flags) == -1
if LibC.dup3(other.@fd, @fd, flags) == -1
raise Errno.new("Could not reopen file descriptor")
end
{% else %}
# dup doesn't copy the CLOEXEC flag, copy it manually to the new
if LibC.dup2(other.fd, self.fd) == -1
if LibC.dup2(other.@fd, @fd) == -1
raise Errno.new("Could not reopen file descriptor")
end

Expand Down