Skip to content

Remove usage of IO internals. #43

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
merged 4 commits into from
May 29, 2023
Merged

Remove usage of IO internals. #43

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
105f263
Remove usage of IO internals.
ioquatix May 28, 2023
d1d9aef
Use another name for fallback functions to avoid clashing with potent…
eregon May 29, 2023
b4543ab
Add fallback for rb_io_get_write_io()
eregon May 29, 2023
06c38a6
2.6 compatibility.
ioquatix May 29, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
2.6 compatibility.
  • Loading branch information
@ioquatix @eregon
ioquatix authored and eregon committed May 29, 2023
commit 06c38a612e396eaaf6afabd2b521c63fca17ca1c
6 changes: 4 additions & 2 deletions ext/io/console/console.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,6 +845,7 @@ console_set_winsize(VALUE io, VALUE size)
VALUE row, col, xpixel, ypixel;
const VALUE *sz;
long sizelen;
int fd;

size = rb_Array(size);
if ((sizelen = RARRAY_LEN(size)) != 2 && sizelen != 4) {
Expand All @@ -853,7 +854,7 @@ console_set_winsize(VALUE io, VALUE size)
sz = RARRAY_CONST_PTR(size);
row = sz[0], col = sz[1], xpixel = ypixel = Qnil;
if (sizelen == 4) xpixel = sz[2], ypixel = sz[3];
int fd = GetWriteFD(io);
fd = GetWriteFD(io);
#if defined TIOCSWINSZ
ws.ws_row = ws.ws_col = ws.ws_xpixel = ws.ws_ypixel = 0;
#define SET(m) ws.ws_##m = NIL_P(m) ? 0 : (unsigned short)NUM2UINT(m)
Expand Down Expand Up @@ -1399,7 +1400,7 @@ console_clear_screen(VALUE io)

#ifndef HAVE_RB_IO_OPEN_DESCRIPTOR
static VALUE
rb_io_open_descriptor(VALUE klass, int descriptor, int mode, VALUE path, VALUE timeout, rb_io_enc_t *encoding)
io_open_descriptor_fallback(VALUE klass, int descriptor, int mode, VALUE path, VALUE timeout, void *encoding)
{
rb_update_max_fd(descriptor);

Expand All @@ -1417,6 +1418,7 @@ rb_io_open_descriptor(VALUE klass, int descriptor, int mode, VALUE path, VALUE t

return self;
}
#define rb_io_open_descriptor io_open_descriptor_fallback
#endif

#ifndef HAVE_RB_IO_CLOSED_P
Expand Down