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

From f4f0c793f6eb427b0a85445bff49fdc6b73447ae Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Sun, 13 Mar 2022 15:10:34 +0900
Subject: merge revision(s) b555e659c4974acc423083b71b1bd5ec6a926046: [Backport
 #18388]

	Do not use `fcopyfile` if appending to non-empty file [Bug #18388]

	`fcopyfile` appends `src` to `to` and then truncates `to` to it's
	original size.
	---
	 io.c                 |  7 +++++++
	 test/ruby/test_io.rb | 12 ++++++++++++
	 2 files changed, 19 insertions(+)
---
 io.c                 |  7 +++++++
 test/ruby/test_io.rb | 12 ++++++++++++
 version.h            |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/io.c b/io.c
index 9720aed06e..caa4dd28f7 100644
--- a/io.c
+++ b/io.c
@@ -11250,6 +11250,13 @@ nogvl_fcopyfile(struct copy_stream_struct *stp) https://github.com/ruby/ruby/blob/trunk/io.c#L11250
         return 0;
     if (lseek(stp->dst_fd, 0, SEEK_CUR) > (off_t)0) /* if dst IO was already written */
         return 0;
+    if (fcntl(stp->dst_fd, F_GETFL) & O_APPEND) {
+        /* fcopyfile(3) appends src IO to dst IO and then truncates
+         * dst IO to src IO's original size. */
+        off_t end = lseek(stp->dst_fd, 0, SEEK_END);
+        lseek(stp->dst_fd, 0, SEEK_SET);
+        if (end > (off_t)0) return 0;
+    }
 
     if (src_offset > (off_t)0) {
         off_t r;
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 5b84fd6a4d..e178e7579b 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -476,6 +476,18 @@ class TestIO < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_io.rb#L476
     }
   end
 
+  def test_copy_stream_append_to_nonempty
+    with_srccontent("foobar") {|src, content|
+      preface = 'preface'
+      File.write('dst', preface)
+      File.open('dst', 'ab') do |dst|
+        ret = IO.copy_stream(src, dst)
+        assert_equal(content.bytesize, ret)
+        assert_equal(preface + content, File.read("dst"))
+      end
+    }
+  end
+
   def test_copy_stream_smaller
     with_srccontent {|src, content|
 
diff --git a/version.h b/version.h
index 35084ce3b9..a1f784e3fd 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 4
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 193
+#define RUBY_PATCHLEVEL 194
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 3
-- 
cgit v1.2.1


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