ruby-changes:72674
From: NAKAMURA <ko1@a...>
Date: Mon, 25 Jul 2022 20:40:03 +0900 (JST)
Subject: [ruby-changes:72674] 6ac4449fce (ruby_3_0): merge revision(s) 7f81f335478a3ca873f34e3bc0af6927819d3e84: [Backport #18734]
https://git.ruby-lang.org/ruby.git/commit/?id=6ac4449fce From 6ac4449fce6257ffe653a743880cead2e43167e8 Mon Sep 17 00:00:00 2001 From: NAKAMURA Usaku <usa@r...> Date: Sat, 18 Jun 2022 23:00:21 +0900 Subject: merge revision(s) 7f81f335478a3ca873f34e3bc0af6927819d3e84: [Backport #18734] Return `false` where sticky-bit is not provided [Bug #18734] --- file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- file.c | 2 +- test/ruby/test_file_exhaustive.rb | 2 +- version.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/file.c b/file.c index e77042fe20..a5656861ca 100644 --- a/file.c +++ b/file.c @@ -2173,7 +2173,7 @@ rb_file_sticky_p(VALUE obj, VALUE fname) https://github.com/ruby/ruby/blob/trunk/file.c#L2173 #ifdef S_ISVTX return check3rdbyte(fname, S_ISVTX); #else - return Qnil; + return Qfalse; #endif } diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb index 2fe3b8535b..b9e2a05b8a 100644 --- a/test/ruby/test_file_exhaustive.rb +++ b/test/ruby/test_file_exhaustive.rb @@ -1490,7 +1490,7 @@ class TestFileExhaustive < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_file_exhaustive.rb#L1490 assert_equal(stat.file?, File.file?(f), f) assert_equal(stat.setgid?, File.setgid?(f), f) assert_equal(stat.grpowned?, File.grpowned?(f), f) - assert_equal(stat.sticky?, File.sticky?(f), f) if stickyfile + assert_equal(stat.sticky?, File.sticky?(f), f) assert_equal(File.lstat(f).symlink?, File.symlink?(f), f) assert_equal(stat.owned?, File.owned?(f), f) assert_equal(stat.pipe?, File.pipe?(f), f) diff --git a/version.h b/version.h index 647e4cee3d..e52e1bb231 100644 --- a/version.h +++ b/version.h @@ -12,7 +12,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L12 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 5 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 209 +#define RUBY_PATCHLEVEL 210 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 6 -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/