diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2018-08-31 13:07:47 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2018-08-31 13:08:02 -0700 |
| commit | 81b9d87bae23efc42e2121ac066fe38fceb96124 (patch) | |
| tree | 5d7c20057b29cea4cfa895f5301d6133e1fa6bc5 /support/test-container.c | |
| parent | d330f31af68f96dde82840d1e9343b479a8c179e (diff) | |
| download | glibc-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/test-container.c')
| -rw-r--r-- | support/test-container.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/support/test-container.c b/support/test-container.c index 2e91bdf9ec..c56b53ed81 100644 --- a/support/test-container.c +++ b/support/test-container.c @@ -383,8 +383,7 @@ copy_one_file (const char *sname, const char *dname) if (dfd < 0) FAIL_EXIT1 ("unable to open %s for writing\n", dname); - if (copy_file_range (sfd, 0, dfd, 0, st.st_size, 0) != st.st_size) - FAIL_EXIT1 ("cannot copy file %s to %s\n", sname, dname); + xcopy_file_range (sfd, 0, dfd, 0, st.st_size, 0); xclose (sfd); xclose (dfd); |