diff options
| author | Andreas Schwab <schwab@suse.de> | 2015-08-10 14:12:47 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2015-08-10 18:15:31 +0200 |
| commit | 561a9f11a974a447acb3dd03550a05df701a900e (patch) | |
| tree | b813640bfa73dcdcd2269c86ad09c7186f9384dc | |
| parent | 19742d3d5f8fb0cdc95b20c32fbee503d1048286 (diff) | |
| download | glibc-561a9f11a974a447acb3dd03550a05df701a900e.tar.gz | |
Readd O_LARGEFILE flag for openat64 (bug 18781)
(cherry picked from commit eb32b0d40308166c4d8f6330cc2958cb1e545075)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | io/test-lfs.c | 21 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/openat.c | 5 |
4 files changed, 33 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2015-08-10 Andreas Schwab <schwab@suse.de> + + [BZ #18781] + * sysdeps/unix/sysv/linux/openat.c (__OPENAT) [MORE_OFLAGS]: Add + MORE_OFLAGS to oflag. + * io/test-lfs.c (do_test): Test openat64. + 2015-08-08 John David Anglin <danglin@gcc.gnu.org> [BZ #18787] @@ -9,7 +9,7 @@ Version 2.22.1 * The following bugs are resolved with this release: - 18787. + 18781, 18787. Version 2.22 diff --git a/io/test-lfs.c b/io/test-lfs.c index 539c2a2b14..b6ebae403c 100644 --- a/io/test-lfs.c +++ b/io/test-lfs.c @@ -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; diff --git a/sysdeps/unix/sysv/linux/openat.c b/sysdeps/unix/sysv/linux/openat.c index 677712330e..ad8e31d6cf 100644 --- a/sysdeps/unix/sysv/linux/openat.c +++ b/sysdeps/unix/sysv/linux/openat.c @@ -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) |