From 81b9d87bae23efc42e2121ac066fe38fceb96124 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 31 Aug 2018 13:07:47 -0700 Subject: 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 [BZ #23597] * support/Makefile (libsupport-routines): Add support_copy_file_range and xcopy_file_range. * support/support.h: Include . (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. --- support/support.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'support/support.h') 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 /* For mode_t. */ #include +/* For ssize_t and off64_t. */ +#include __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 */ -- cgit 1.4.1