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
0e93f1ff
Unverified
Commit
0e93f1ff
authored
Jan 24, 2018
by
Yukihiro "Matz" Matsumoto
Committed by
GitHub
Jan 24, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3921 from ksss/cloexec
Should be true for close_on_exec flag
parents
dfb56074
dc9c40f7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
8 deletions
+20
-8
mrbgems/mruby-io/src/io.c
mrbgems/mruby-io/src/io.c
+16
-8
mrbgems/mruby-io/test/io.rb
mrbgems/mruby-io/test/io.rb
+4
-0
No files found.
mrbgems/mruby-io/src/io.c
View file @
0e93f1ff
...
...
@@ -180,7 +180,7 @@ mrb_io_flags_to_modenum(mrb_state *mrb, int flags)
return
modenum
;
}
void
static
void
mrb_fd_cloexec
(
mrb_state
*
mrb
,
int
fd
)
{
#if defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
...
...
@@ -188,7 +188,8 @@ mrb_fd_cloexec(mrb_state *mrb, int fd)
flags
=
fcntl
(
fd
,
F_GETFD
);
if
(
flags
==
-
1
)
{
mrb_sys_fail
(
mrb
,
"fcntl"
);
mrb_bug
(
mrb
,
"mrb_fd_cloexec: fcntl(%S, F_GETFD) failed: %S"
,
mrb_fixnum_value
(
fd
),
mrb_fixnum_value
(
errno
));
}
if
(
fd
<=
2
)
{
flags2
=
flags
&
~
FD_CLOEXEC
;
/* Clear CLOEXEC for standard file descriptors: 0, 1, 2. */
...
...
@@ -198,7 +199,8 @@ mrb_fd_cloexec(mrb_state *mrb, int fd)
}
if
(
flags
!=
flags2
)
{
if
(
fcntl
(
fd
,
F_SETFD
,
flags2
)
==
-
1
)
{
mrb_sys_fail
(
mrb
,
"fcntl"
);
mrb_bug
(
mrb
,
"mrb_fd_cloexec: fcntl(%S, F_SETFD, %S) failed: %S"
,
mrb_fixnum_value
(
fd
),
mrb_fixnum_value
(
flags2
),
mrb_fixnum_value
(
errno
));
}
}
#endif
...
...
@@ -577,11 +579,17 @@ mrb_io_initialize_copy(mrb_state *mrb, mrb_value copy)
if
(
failed
)
{
mrb_sys_fail
(
mrb
,
0
);
}
mrb_fd_cloexec
(
mrb
,
fptr_copy
->
fd
);
if
(
fptr_orig
->
fd2
!=
-
1
)
{
fptr_copy
->
fd2
=
mrb_dup
(
mrb
,
fptr_orig
->
fd2
,
&
failed
);
if
(
failed
)
{
close
(
fptr_copy
->
fd
);
mrb_sys_fail
(
mrb
,
0
);
}
mrb_fd_cloexec
(
mrb
,
fptr_copy
->
fd2
);
}
fptr_copy
->
pid
=
fptr_orig
->
pid
;
fptr_copy
->
readable
=
fptr_orig
->
readable
;
fptr_copy
->
writable
=
fptr_orig
->
writable
;
...
...
mrbgems/mruby-io/test/io.rb
View file @
0e93f1ff
...
...
@@ -216,6 +216,10 @@ assert('IO#dup for readable') do
dup
=
io
.
dup
assert_true
io
!=
dup
assert_true
io
.
fileno
!=
dup
.
fileno
begin
assert_true
dup
.
close_on_exec?
rescue
NotImplementedError
end
assert_equal
'm'
,
dup
.
sysread
(
1
)
assert_equal
'r'
,
io
.
sysread
(
1
)
assert_equal
'u'
,
dup
.
sysread
(
1
)
...
...
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