about summary refs log tree commit diff
path: root/support/support.h
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2018-08-31 13:07:47 -0700
committerH.J. Lu <hjl.tools@gmail.com>2018-08-31 13:08:02 -0700
commit81b9d87bae23efc42e2121ac066fe38fceb96124 (patch)
tree5d7c20057b29cea4cfa895f5301d6133e1fa6bc5 /support/support.h
parentd330f31af68f96dde82840d1e9343b479a8c179e (diff)
downloadglibc-81b9d87bae23efc42e2121ac066fe38fceb96124.tar.gz
glibc-81b9d87bae23efc42e2121ac066fe38fceb96124.tar.xz
glibc-81b9d87bae23efc42e2121ac066fe38fceb96124.zip
test-container: Use xcopy_file_range for cross-device copy [BZ #23597]
copy_file_range can't be used to copy a file from glibc source directory
to glibc build directory since they may be on different filesystems.
This patch adds xcopy_file_range for cross-device copy.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

	[BZ #23597]
	* support/Makefile (libsupport-routines): Add
	support_copy_file_range and xcopy_file_range.
	* support/support.h: Include <sys/types.h>.
	(support_copy_file_range): New prototype.
	* support/support_copy_file_range.c: New file.  Copied and
	modified from io/copy_file_range-compat.c.
	* support/test-container.c (copy_one_file): Call xcopy_file_rang
	instead of copy_file_range.
	* support/xcopy_file_range.c: New file.
	* support/xunistd.h (xcopy_file_range): New prototype.
Diffstat (limited to 'support/support.h')
-rw-r--r--support/support.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/support/support.h b/support/support.h
index c6ff4bafb4..d0e15bca1d 100644
--- a/support/support.h
+++ b/support/support.h
@@ -27,6 +27,8 @@
 #include <sys/cdefs.h>
 /* For mode_t.  */
 #include <sys/stat.h>
+/* For ssize_t and off64_t.  */
+#include <sys/types.h>
 
 __BEGIN_DECLS
 
@@ -94,6 +96,9 @@ extern const char support_install_prefix[];
 /* Corresponds to the install's lib/ or lib64/ directory.  */
 extern const char support_libdir_prefix[];
 
+extern ssize_t support_copy_file_range (int, off64_t *, int, off64_t *,
+					size_t, unsigned int);
+
 __END_DECLS
 
 #endif /* SUPPORT_H */