1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
|
From 8e0cc29a3cb73a87cf9741d154bfcc96a5475b64 Mon Sep 17 00:00:00 2001
From: Lars Kanis <lars.kanis@sincnovation.com>
Date: Wed, 12 Feb 2025 14:40:12 +0100
Subject: [PATCH 01/10] Fix compatibility with ruby-3.4
This merges the fix and polyfill discussed in: https://bugs.ruby-lang.org/issues/20265#note-7
Fixes #78
---
ext/native/extconf.rb | 2 ++
ext/native/posix_serialport_impl.c | 20 +++-----------------
ext/native/serialport.c | 21 +++++++++++++++++++++
ext/native/serialport.h | 5 +++++
ext/native/win_serialport_impl.c | 19 +++----------------
5 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/ext/native/extconf.rb b/ext/native/extconf.rb
index 02a8d8b..3b384af 100644
--- a/ext/native/extconf.rb
+++ b/ext/native/extconf.rb
@@ -10,4 +10,6 @@ if !(os == 'mswin' or os == 'bccwin' or os == 'mingw')
exit(1) if not have_header("termios.h") or not have_header("unistd.h")
end
+have_func("rb_io_open_descriptor") # ruby-3.3+
+
create_makefile('serialport')
diff --git a/ext/native/posix_serialport_impl.c b/ext/native/posix_serialport_impl.c
index 2f9325e..a38d29f 100644
--- a/ext/native/posix_serialport_impl.c
+++ b/ext/native/posix_serialport_impl.c
@@ -80,12 +80,6 @@ int get_fd_helper(obj)
VALUE sp_create_impl(class, _port)
VALUE class, _port;
{
-#ifdef HAVE_RUBY_IO_H
- rb_io_t *fp;
-#else
- OpenFile *fp;
-#endif
-
int fd;
int num_port;
char *port;
@@ -108,10 +102,7 @@ VALUE sp_create_impl(class, _port)
#endif
};
struct termios params;
-
- NEWOBJ(sp, struct RFile);
- OBJSETUP(sp, class, T_FILE);
- MakeOpenFile((VALUE) sp, fp);
+ VALUE sp;
switch(TYPE(_port))
{
@@ -166,14 +157,9 @@ VALUE sp_create_impl(class, _port)
rb_sys_fail(sTcsetattr);
}
-#ifdef HAVE_RUBY_IO_H
- fp->fd = fd;
-#else
- fp->f = rb_fdopen(fd, "r+");
-#endif
- fp->mode = FMODE_READWRITE | FMODE_SYNC;
+ sp = rb_io_open_descriptor(class, fd, FMODE_READWRITE | FMODE_SYNC, Qnil, Qnil, NULL);
- return (VALUE) sp;
+ return sp;
}
VALUE sp_set_modem_params_impl(argc, argv, self)
diff --git a/ext/native/serialport.c b/ext/native/serialport.c
index 88ca9a2..0c3f276 100644
--- a/ext/native/serialport.c
+++ b/ext/native/serialport.c
@@ -20,6 +20,27 @@ VALUE cSerialPort; /* serial port class */
VALUE sBaud, sDataBits, sStopBits, sParity; /* strings */
VALUE sRts, sDtr, sCts, sDsr, sDcd, sRi;
+
+#ifndef HAVE_RB_IO_OPEN_DESCRIPTOR
+VALUE
+io_open_descriptor_fallback(VALUE klass, int descriptor, int mode, VALUE path, VALUE timeout, void *encoding)
+{
+ VALUE arguments[2] = {
+ (rb_update_max_fd(descriptor), INT2NUM(descriptor)),
+ INT2FIX(mode),
+ };
+
+ VALUE self = rb_class_new_instance(2, arguments, klass);
+
+ rb_io_t *fptr;
+ GetOpenFile(self, fptr);
+ fptr->pathv = path;
+ fptr->mode |= mode;
+
+ return self;
+}
+#endif
+
/*
* @api private
*
diff --git a/ext/native/serialport.h b/ext/native/serialport.h
index 6aceaf2..166b88a 100644
--- a/ext/native/serialport.h
+++ b/ext/native/serialport.h
@@ -28,6 +28,11 @@
#include <rubyio.h>
#endif
+#ifndef HAVE_RB_IO_OPEN_DESCRIPTOR
+VALUE io_open_descriptor_fallback(VALUE klass, int descriptor, int mode, VALUE path, VALUE timeout, void *encoding);
+#define rb_io_open_descriptor io_open_descriptor_fallback
+#endif
+
struct modem_params
{
int data_rate;
diff --git a/ext/native/win_serialport_impl.c b/ext/native/win_serialport_impl.c
index 7ad3910..465d5f8 100644
--- a/ext/native/win_serialport_impl.c
+++ b/ext/native/win_serialport_impl.c
@@ -62,23 +62,15 @@ static void _rb_win32_fail(const char *function_call) {
VALUE RB_SERIAL_EXPORT sp_create_impl(class, _port)
VALUE class, _port;
{
-#ifdef HAVE_RUBY_IO_H
- rb_io_t *fp;
-#else
- OpenFile *fp;
-#endif
int fd;
HANDLE fh;
int num_port;
char *str_port;
char port[260]; /* Windows XP MAX_PATH. See http://msdn.microsoft.com/en-us/library/aa365247(VS.85).aspx */
+ VALUE sp;
DCB dcb;
- NEWOBJ(sp, struct RFile);
- OBJSETUP(sp, class, T_FILE);
- MakeOpenFile((VALUE) sp, fp);
-
switch(TYPE(_port))
{
case T_FIXNUM:
@@ -148,13 +140,8 @@ VALUE RB_SERIAL_EXPORT sp_create_impl(class, _port)
}
errno = 0;
- fp->mode = FMODE_READWRITE | FMODE_BINMODE | FMODE_SYNC;
-#ifdef HAVE_RUBY_IO_H
- fp->fd = fd;
-#else
- fp->f = fdopen(fd, "rb+");
-#endif
- return (VALUE) sp;
+ sp = rb_io_open_descriptor(class, fd, FMODE_READWRITE | FMODE_BINMODE | FMODE_SYNC, Qnil, Qnil, NULL);
+ return sp;
}
VALUE RB_SERIAL_EXPORT sp_set_modem_params_impl(argc, argv, self)
--
2.39.5
|
