From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 2 Nov 2018 14:37:50 +0000 (+0100)
Subject: support/shell-container.c: Use support_copy_file_range
X-Git-Tag: glibc-2.29~337
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e36266cec43aac8bb22457428343fcbd523f108;p=thirdparty%2Fglibc.git

support/shell-container.c: Use support_copy_file_range

Reviewed-by: DJ Delorie <dj@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index da72d308c8a..497f5b721c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-11-02  Florian Weimer  <fweimer@redhat.com>
+
+	* support/shell-container.c (copy_func): Call
+	support_copy_file_range instead of copy_file_range to support
+	cross-device copies.
+
 2018-11-02  Florian Weimer  <fweimer@redhat.com>
 
 	* support/test-container.c: Include <libc-pointer-arith.h> for
diff --git a/support/shell-container.c b/support/shell-container.c
index d303131dafc..9bd90d3f605 100644
--- a/support/shell-container.c
+++ b/support/shell-container.c
@@ -119,7 +119,7 @@ copy_func (char **argv)
       return 1;
     }
 
-  if (copy_file_range (sfd, 0, dfd, 0, st.st_size, 0) != st.st_size)
+  if (support_copy_file_range (sfd, 0, dfd, 0, st.st_size, 0) != st.st_size)
     {
       fprintf (stderr, "cp: cannot copy file %s to %s: %s\n",
 	       sname, dname, strerror (errno));