mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 08:30:00 +00:00
468700675f
The p{read,write}v{64} consolidation patch [1] added a wrong guard
for LO_HI_LONG definition. It currently uses both
'__WORDSIZE == 64' and 'defined __ASSUME_WORDSIZE64_ILP32' to set
the value to be passed in one argument, otherwise it will be split
in two.
However it fails on MIPS64n32 where syscalls n32 uses the compat
implementation in the kernel meaning the off_t arguments are passed
in two separate registers.
GLIBC already defines a macro for such cases (__OFF_T_MATCHES_OFF64_T),
so this patch uses it instead.
Checked on x86_64, i686, x32, aarch64, armhf, and s390.
* sysdeps/unix/sysv/linux/sysdep.h
[__WORDSIZE == 64 || __ASSUME_WORDSIZE64_ILP32] (LO_HI_LONG): Remove
guards.
* misc/tst-preadvwritev-common.c: New file.
* misc/tst-preadvwritev.c: Use tst-preadvwritev-common.c.
* misc/tst-preadvwritev64.c: Use tst-preadwritev-common.c and add
a check for files larger than 2GB.
[1] 4751bbe2ad
52 lines
1.6 KiB
C
52 lines
1.6 KiB
C
/* Tests for pread64 and pwrite64.
|
|
Copyright (C) 2016 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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#define _FILE_OFFSET_BITS 64
|
|
#include "tst-preadvwritev-common.c"
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
int ret;
|
|
|
|
ret = do_test_with_offset (0);
|
|
|
|
/* Create a sparse file larger than 4GB to check if offset is handled
|
|
correctly in p{write,read}v64. */
|
|
off_t base_offset = UINT32_MAX + 2048LL;
|
|
ret += do_test_with_offset (base_offset);
|
|
|
|
struct stat st;
|
|
if (fstat (temp_fd, &st) == -1)
|
|
{
|
|
printf ("error: fstat on temporary file failed: %m");
|
|
return 1;
|
|
}
|
|
|
|
/* The total size should base_offset plus 2 * 96. */
|
|
off_t expected_value = base_offset + (2 * (96LL));
|
|
if (st.st_size != expected_value)
|
|
{
|
|
printf ("error: file size different than expected (%jd != %jd)\n",
|
|
(intmax_t) expected_value, (intmax_t) st.st_size);
|
|
return 1;
|
|
}
|
|
|
|
return ret;
|
|
}
|