[前][次][番号順一覧][スレッド一覧]

ruby-changes:73720

From: nagachika <ko1@a...>
Date: Sun, 25 Sep 2022 14:05:42 +0900 (JST)
Subject: [ruby-changes:73720] 89eab8e0bf (ruby_3_1): merge revision(s) 7f81f335478a3ca873f34e3bc0af6927819d3e84: [Backport #18734]

https://git.ruby-lang.org/ruby.git/commit/?id=89eab8e0bf

From 89eab8e0bf34ed36f32c1f8c230790f8b23a356f Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Sun, 25 Sep 2022 13:46:29 +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 +-
 version.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/file.c b/file.c
index 2d0f323406..6a0e84b8d5 100644
--- a/file.c
+++ b/file.c
@@ -2161,7 +2161,7 @@ rb_file_sticky_p(VALUE obj, VALUE fname) https://github.com/ruby/ruby/blob/trunk/file.c#L2161
 #ifdef S_ISVTX
     return check3rdbyte(fname, S_ISVTX);
 #else
-    return Qnil;
+    return Qfalse;
 #endif
 }
 
diff --git a/version.h b/version.h
index 0eeba12939..70ce3a0bcd 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 3
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 60
+#define RUBY_PATCHLEVEL 61
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 9
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]