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/xcopy_file_range.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 support/xcopy_file_range.c (limited to 'support/xcopy_file_range.c') diff --git a/support/xcopy_file_range.c b/support/xcopy_file_range.c new file mode 100644 index 0000000000..b3501a4d5e --- /dev/null +++ b/support/xcopy_file_range.c @@ -0,0 +1,32 @@ +/* copy_file_range with error checking. + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include + +ssize_t +xcopy_file_range (int infd, off64_t *pinoff, int outfd, off64_t *poutoff, + size_t length, unsigned int flags) +{ + ssize_t status = support_copy_file_range (infd, pinoff, outfd, + poutoff, length, flags); + if (status == -1) + FAIL_EXIT1 ("cannot copy file: %m\n"); + return status; +} -- cgit v1.2.3-70-g09d2