procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Do not use off64_t in calls to copy_file_range [PR110462]

Browse source 
Although the copy_file_range(2) man page shows the arguments as off64_t*
that is not portable. For musl there is no off64_t type, as off_t is
always 64-bit. Use the loff_t type which is always 64-bit even if off_t
isn't. We could just use off_t because the filesystem library is
compiled with _FILE_OFFSET_BITS=64, but loff_t is the more correct type
for this interface.

libstdc++-v3/ChangeLog:

	PR libstdc++/110462
	* acinclude.m4 (GLIBCXX_CHECK_FILESYSTEM_DEPS): Check that
	copy_file_range can be called with loff_t* arguments.
	* configure: Regenerate.
	* src/filesystem/ops-common.h (copy_file_copy_file_range):
	Use loff_t for offsets.
This commit is contained in:
Jonathan Wakely 2023-06-28 19:10:29 +01:00
parent e972bdce61
commit ff29ee6af8
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libstdc++-v3/acinclude.m4
View file

@ -5160,7 +5160,7 @@ dnl
linux*)
GCC_TRY_COMPILE_OR_LINK(
[#include <unistd.h>],
[copy_file_range(1, nullptr, 2, nullptr, 1, 0);],
[copy_file_range(1, (loff_t*)nullptr, 2, (loff_t*)nullptr, 1, 0);],
[glibcxx_cv_copy_file_range=yes],
[glibcxx_cv_copy_file_range=no])
;;

4
libstdc++-v3/configure vendored
View file

@ -72473,7 +72473,7 @@ else
int
main ()
{
copy_file_range(1, nullptr, 2, nullptr, 1, 0);
copy_file_range(1, (loff_t*)nullptr, 2, (loff_t*)nullptr, 1, 0);
;
return 0;
}
@ -72494,7 +72494,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
int
main ()
{
copy_file_range(1, nullptr, 2, nullptr, 1, 0);
copy_file_range(1, (loff_t*)nullptr, 2, (loff_t*)nullptr, 1, 0);
;
return 0;
}

2
libstdc++-v3/src/filesystem/ops-common.h
View file

@ -374,7 +374,7 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM
return false;
}
size_t bytes_left = length;
off64_t off_in = 0, off_out = 0;
loff_t off_in = 0, off_out = 0;
ssize_t bytes_copied;
do
{