Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
a510564d
Unverified
Commit
a510564d
authored
Dec 18, 2017
by
Yukihiro "Matz" Matsumoto
Committed by
GitHub
Dec 18, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3903 from ksss/io-dup
Implement IO#initialize_copy
parents
ddb1aae4
35185e69
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
79 additions
and
1 deletion
+79
-1
mrbgems/mruby-io/README.md
mrbgems/mruby-io/README.md
+1
-1
mrbgems/mruby-io/src/io.c
mrbgems/mruby-io/src/io.c
+49
-0
mrbgems/mruby-io/test/io.rb
mrbgems/mruby-io/test/io.rb
+29
-0
No files found.
mrbgems/mruby-io/README.md
View file @
a510564d
...
...
@@ -40,7 +40,7 @@ Add the line below to your `build_config.rb`:
| IO#binmode? | | |
| IO#bytes | | obsolete |
| IO#chars | | obsolete |
| IO#clone, IO#dup |
| |
| IO#clone, IO#dup |
o
| |
| IO#close | o | |
| IO#close_on_exec= | o | |
| IO#close_on_exec? | o | |
...
...
mrbgems/mruby-io/src/io.c
View file @
a510564d
...
...
@@ -530,6 +530,54 @@ mrb_io_s_popen(mrb_state *mrb, mrb_value klass)
}
#endif
static
int
mrb_dup
(
mrb_state
*
mrb
,
int
fd
)
{
int
new_fd
;
if
(
fd
<
0
)
return
fd
;
new_fd
=
dup
(
fd
);
if
(
new_fd
==
-
1
)
mrb_sys_fail
(
mrb
,
0
);
return
new_fd
;
}
mrb_value
mrb_io_initialize_copy
(
mrb_state
*
mrb
,
mrb_value
copy
)
{
mrb_value
orig
;
mrb_value
buf
;
struct
mrb_io
*
fptr_copy
;
struct
mrb_io
*
fptr_orig
;
mrb_get_args
(
mrb
,
"o"
,
&
orig
);
fptr_copy
=
(
struct
mrb_io
*
)
DATA_PTR
(
copy
);
if
(
fptr_copy
!=
NULL
)
{
fptr_finalize
(
mrb
,
fptr_copy
,
FALSE
);
mrb_free
(
mrb
,
fptr_copy
);
}
fptr_copy
=
(
struct
mrb_io
*
)
mrb_io_alloc
(
mrb
);
fptr_orig
=
io_get_open_fptr
(
mrb
,
orig
);
buf
=
mrb_iv_get
(
mrb
,
orig
,
mrb_intern_cstr
(
mrb
,
"@buf"
));
mrb_iv_set
(
mrb
,
copy
,
mrb_intern_cstr
(
mrb
,
"@buf"
),
buf
);
fptr_copy
->
fd
=
mrb_dup
(
mrb
,
fptr_orig
->
fd
);
fptr_copy
->
fd2
=
mrb_dup
(
mrb
,
fptr_orig
->
fd2
);
fptr_copy
->
pid
=
fptr_orig
->
pid
;
fptr_copy
->
readable
=
fptr_orig
->
readable
;
fptr_copy
->
writable
=
fptr_orig
->
writable
;
fptr_copy
->
sync
=
fptr_orig
->
sync
;
fptr_copy
->
is_socket
=
fptr_orig
->
is_socket
;
DATA_TYPE
(
copy
)
=
&
mrb_io_type
;
DATA_PTR
(
copy
)
=
fptr_copy
;
return
copy
;
}
mrb_value
mrb_io_initialize
(
mrb_state
*
mrb
,
mrb_value
io
)
{
...
...
@@ -1238,6 +1286,7 @@ mrb_init_io(mrb_state *mrb)
#endif
mrb_define_method
(
mrb
,
io
,
"initialize"
,
mrb_io_initialize
,
MRB_ARGS_ANY
());
/* 15.2.20.5.21 (x)*/
mrb_define_method
(
mrb
,
io
,
"initialize_copy"
,
mrb_io_initialize_copy
,
MRB_ARGS_REQ
(
1
));
mrb_define_method
(
mrb
,
io
,
"_check_readable"
,
mrb_io_check_readable
,
MRB_ARGS_NONE
());
mrb_define_method
(
mrb
,
io
,
"isatty"
,
mrb_io_isatty
,
MRB_ARGS_NONE
());
mrb_define_method
(
mrb
,
io
,
"sync"
,
mrb_io_sync
,
MRB_ARGS_NONE
());
...
...
mrbgems/mruby-io/test/io.rb
View file @
a510564d
...
...
@@ -211,6 +211,35 @@ assert('IO#<<') do
true
end
assert
(
'IO#dup for readable'
)
do
io
=
IO
.
new
(
IO
.
sysopen
(
$mrbtest_io_rfname
))
dup
=
io
.
dup
assert_true
io
!=
dup
assert_true
io
.
fileno
!=
dup
.
fileno
assert_equal
'm'
,
dup
.
sysread
(
1
)
assert_equal
'r'
,
io
.
sysread
(
1
)
assert_equal
'u'
,
dup
.
sysread
(
1
)
assert_equal
'b'
,
io
.
sysread
(
1
)
assert_equal
'y'
,
dup
.
sysread
(
1
)
dup
.
close
assert_false
io
.
closed?
io
.
close
true
end
assert
(
'IO#dup for writable'
)
do
io
=
IO
.
open
(
IO
.
sysopen
(
$mrbtest_io_wfname
,
'w+'
),
'w+'
)
dup
=
io
.
dup
io
.
syswrite
"mruby"
assert_equal
5
,
dup
.
sysseek
(
0
,
IO
::
SEEK_CUR
)
io
.
sysseek
0
,
IO
::
SEEK_SET
assert_equal
0
,
dup
.
sysseek
(
0
,
IO
::
SEEK_CUR
)
assert_equal
"mruby"
,
dup
.
sysread
(
5
)
dup
.
close
io
.
close
true
end
assert
(
'IO.for_fd'
)
do
fd
=
IO
.
sysopen
(
$mrbtest_io_rfname
)
io
=
IO
.
for_fd
(
fd
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment