Readd O_LARGEFILE flag for openat64
Commit Message
This was broken by commit c6bb095.
Andreas.
[BZ #18781]
* sysdeps/unix/sysv/linux/openat.c (__OPENAT) [MORE_OFLAGS]: Add
MORE_OFLAGS to oflag.
* io/test-lfs.c (do_test): Test openat64.
---
io/test-lfs.c | 21 ++++++++++++++++++++-
sysdeps/unix/sysv/linux/openat.c | 5 +++++
2 files changed, 25 insertions(+), 1 deletion(-)
Comments
On 10 Aug 2015 15:01, Andreas Schwab wrote:
> + error (0, 0, "openat64 is not supported");
shouldn't all of these error() calls be printf ? error() writes to stderr.
maybe test-skeleton.c should close stderr and dupe stdout to it ?
not that it's a regression -- this test uses it a lot. so lgtm as-is.
-mike
Mike Frysinger <vapier@gentoo.org> writes:
> On 10 Aug 2015 15:01, Andreas Schwab wrote:
>> + error (0, 0, "openat64 is not supported");
>
> shouldn't all of these error() calls be printf ?
Yes, that would be a nice follow-up task to go through all tests.
> maybe test-skeleton.c should close stderr and dupe stdout to it ?
Or this.
Andreas.
Cherry picked to 2.22 branch.
Andreas.
@@ -144,7 +144,7 @@ test_ftello (void)
int
do_test (int argc, char *argv[])
{
- int ret;
+ int ret, fd2;
struct stat64 statbuf;
ret = lseek64 (fd, TWO_GB+100, SEEK_SET);
@@ -195,6 +195,25 @@ do_test (int argc, char *argv[])
error (EXIT_FAILURE, 0, "stat reported size %lld instead of %lld.",
(long long int) statbuf.st_size, (TWO_GB + 100 + 5));
+ fd2 = openat64 (AT_FDCWD, name, O_RDWR);
+ if (fd2 == -1)
+ {
+ if (errno == ENOSYS)
+ {
+ /* Silently ignore this test. */
+ error (0, 0, "openat64 is not supported");
+ }
+ else
+ error (EXIT_FAILURE, errno, "openat64 failed to open big file");
+ }
+ else
+ {
+ ret = close (fd2);
+
+ if (ret == -1)
+ error (EXIT_FAILURE, errno, "error closing file");
+ }
+
test_ftello ();
return 0;
@@ -68,6 +68,11 @@ __OPENAT (int fd, const char *file, int oflag, ...)
va_end (arg);
}
+ /* We have to add the O_LARGEFILE flag for openat64. */
+#ifdef MORE_OFLAGS
+ oflag |= MORE_OFLAGS;
+#endif
+
return SYSCALL_CANCEL (openat, fd, file, oflag, mode);
}
libc_hidden_def (__OPENAT)