Skip to content

fix: add O_NONBLOCK, O_NOCTTY, O_CLOEXEC to SUPPORTED_SYSOPEN_MODES #413

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

Draft
toddr-bot wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: add O_NONBLOCK, O_NOCTTY, O_CLOEXEC to SUPPORTED_SYSOPEN_MODES #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/Test/MockFile.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use warnings;
# perl -MFcntl -E'eval "say q{$_: } . $_" foreach sort {eval "$a" <=> eval "$b"} qw/O_RDONLY O_WRONLY O_RDWR O_CREAT O_EXCL O_NOCTTY O_TRUNC O_APPEND O_NONBLOCK O_NDELAY O_EXLOCK O_SHLOCK O_DIRECTORY O_NOFOLLOW O_SYNC O_BINARY O_LARGEFILE/'
use Fcntl; # O_RDONLY, etc.

use constant SUPPORTED_SYSOPEN_MODES => O_RDONLY | O_WRONLY | O_RDWR | O_APPEND | O_TRUNC | O_EXCL | O_CREAT | O_NOFOLLOW;
use constant SUPPORTED_SYSOPEN_MODES => O_RDONLY | O_WRONLY | O_RDWR | O_APPEND | O_TRUNC | O_EXCL | O_CREAT | O_NOFOLLOW | O_NONBLOCK | O_NOCTTY | ( eval { O_CLOEXEC() } // 0 );

use constant BROKEN_SYMLINK => bless {}, "A::BROKEN::SYMLINK";
use constant CIRCULAR_SYMLINK => bless {}, "A::CIRCULAR::SYMLINK";
Expand Down
40 changes: 40 additions & 0 deletions t/sysopen.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,5 +303,45 @@ note "sysopen failure returns undef in list context (single-element list)";
ok( !defined $ret[0], 'sysopen failure element is undef (not "undef" string)' );
}

note "sysopen with O_NONBLOCK succeeds (flag accepted and ignored)";
{
my $mock = Test::MockFile->file('/nonblock_test');
is( sysopen( my $fh, '/nonblock_test', O_WRONLY | O_CREAT | O_NONBLOCK, 0600 ), 1,
'sysopen O_WRONLY|O_CREAT|O_NONBLOCK succeeds' );
ok( -e '/nonblock_test', 'file created with O_NONBLOCK' );
is( syswrite( $fh, "hello" ), 5, 'write to O_NONBLOCK-opened file works' );
close $fh;
is( $mock->contents, "hello", 'contents correct after O_NONBLOCK open' );
}

note "sysopen with O_NOCTTY succeeds (flag accepted and ignored)";
{
my $mock = Test::MockFile->file('/noctty_test');
is( sysopen( my $fh, '/noctty_test', O_WRONLY | O_CREAT | O_NOCTTY, 0600 ), 1,
'sysopen O_WRONLY|O_CREAT|O_NOCTTY succeeds' );
ok( -e '/noctty_test', 'file created with O_NOCTTY' );
close $fh;
}

note "sysopen with O_NONBLOCK|O_EXCL combined (issue #412 reproduction)";
{
my $mock = Test::MockFile->file('/nonblock_excl_test');
is( sysopen( my $fh, '/nonblock_excl_test', O_WRONLY | O_CREAT | O_EXCL | O_NONBLOCK, 0600 ), 1,
'sysopen O_WRONLY|O_CREAT|O_EXCL|O_NONBLOCK succeeds' );
ok( -e '/nonblock_excl_test', 'file created with O_NONBLOCK|O_EXCL' );
close $fh;
}

SKIP: {
skip "O_CLOEXEC not available on this system", 2 unless eval { O_CLOEXEC(); 1 };

note "sysopen with O_CLOEXEC succeeds (flag accepted and ignored)";
my $mock = Test::MockFile->file('/cloexec_test');
is( sysopen( my $fh, '/cloexec_test', O_WRONLY | O_CREAT | O_CLOEXEC(), 0600 ), 1,
'sysopen O_WRONLY|O_CREAT|O_CLOEXEC succeeds' );
ok( -e '/cloexec_test', 'file created with O_CLOEXEC' );
close $fh;
}

done_testing();
exit;
Loading