public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-2191] libstdc++: Do not use off64_t in calls to copy_file_range [PR110462]
@ 2023-06-29 15:19 Jonathan Wakely
0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2023-06-29 15:19 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:ff29ee6af88f709e08ee467869d8c1b13889a724
commit r14-2191-gff29ee6af88f709e08ee467869d8c1b13889a724
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Wed Jun 28 19:10:29 2023 +0100
libstdc++: Do not use off64_t in calls to copy_file_range [PR110462]
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.
Diff:
---
libstdc++-v3/acinclude.m4 | 2 +-
libstdc++-v3/configure | 4 ++--
libstdc++-v3/src/filesystem/ops-common.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index efc27aa493e..277ae10e031 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -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])
;;
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index bda8053ecc2..98568ae0c30 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -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;
}
diff --git a/libstdc++-v3/src/filesystem/ops-common.h b/libstdc++-v3/src/filesystem/ops-common.h
index f04bbc66d7d..2e4331bb682 100644
--- a/libstdc++-v3/src/filesystem/ops-common.h
+++ b/libstdc++-v3/src/filesystem/ops-common.h
@@ -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
{
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-06-29 15:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-29 15:19 [gcc r14-2191] libstdc++: Do not use off64_t in calls to copy_file_range [PR110462] Jonathan Wakely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).