diff options
| author | Mark Wielaard <mjw@redhat.com> | 2015-11-06 11:22:38 +0100 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2015-11-06 11:24:16 +0100 |
| commit | 8b7b7f75d91f7bac323dd6a370aeb3e9c5c4a7d5 (patch) | |
| tree | 1d746e27fde388945a60b17e4855a0463d7892a9 /sysdeps/wordsize-64 | |
| parent | 5a28590adfc5ed898a335f7a3359a9243534eded (diff) | |
| download | glibc-8b7b7f75d91f7bac323dd6a370aeb3e9c5c4a7d5.tar.gz | |
Add LFS support for fts functions (bug 11460)
fts didn't have large-file support yet and fts.h had an #error preventing
usage when _FILE_OFFSET_BITS was set. This required nasty workarounds for
programs using fts with LFS. This patch implements LFS support for fts by
adding FTS64 and FTENT64 variants plus fts64 functions. Which are simple
aliases for 64bit off_t arches.
Also includes a simple testcase for some of the fts functions with or
without LFS enabled.
[BZ #11460]
* io/Makefile (routines): Add fts64.
(tests): Add tst-fts and tst-fts-lfs.
(CFLAGS-fts64.c): New.
* io/Versions (GLIBC_2.23): New.
* io/fts.c: Replace FTS with FTSOBJ, FTSENT with FTSENTRY. Use
function defines FTS_OPEN, FTS_CLOSE, FTS_READ, FTS_SET and
FTS_CHILDREN. Define FTSOBJ, FTSENTRY, FTS_OPEN, FTS_CLOSE,
FTS_READ, FTS_SET, FTS_CHILDREN, INO_T, STAT and LSTAT if necessary.
* io/fts.h (FTS64): New if _USE_LARGEFILE64.
(FTSENT64): Likewise.
(fts64_children): Likewise.
(fts64_close): Likewise.
(fts64_open): Likewise.
(fts64_read): Likewise.
(fts64_set): Likewise.
* io/fts64.c: New file.
* io/tst-fts.c: New test.
* io/tst-fts-lfs.c: Likewise.
* sysdeps/unix/sysv/linux/aarch64/libc.abilist (GLIBC_2.23): Add
GLIBC_2.23, fts64_children, fts64_close, fts64_open, fts64_read and
fts64_set.
* sysdeps/unix/sysv/linux/alpha/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/arm/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/hppa/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/i386/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/ia64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/microblaze/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/nios2/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist:
Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist:
Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/sh/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/x86_64/64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist: Likewise.
* sysdeps/wordsize-64/fts.c: New file.
* sysdeps/wordsize-64/fts64.c: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n64/fts.c: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n64/fts64.c: Likewise.
* sysdeps/unix/sysv/linux/x86_64/x32/fts.c: likewise.
* sysdeps/unix/sysv/linux/x86_64/x32/fts64.c: likewise.
Diffstat (limited to 'sysdeps/wordsize-64')
| -rw-r--r-- | sysdeps/wordsize-64/fts.c | 19 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/fts64.c | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/sysdeps/wordsize-64/fts.c b/sysdeps/wordsize-64/fts.c new file mode 100644 index 0000000000..159dc1febe --- /dev/null +++ b/sysdeps/wordsize-64/fts.c @@ -0,0 +1,19 @@ +#define fts64_open __rename_fts64_open +#define fts64_close __rename_fts64_close +#define fts64_read __rename_fts64_read +#define fts64_set __rename_fts64_set +#define fts64_children __rename_fts64_children + +#include "../../io/fts.c" + +#undef fts64_open +#undef fts64_close +#undef fts64_read +#undef fts64_set +#undef fts64_children + +weak_alias (fts_open, fts64_open) +weak_alias (fts_close, fts64_close) +weak_alias (fts_read, fts64_read) +weak_alias (fts_set, fts64_set) +weak_alias (fts_children, fts64_children) diff --git a/sysdeps/wordsize-64/fts64.c b/sysdeps/wordsize-64/fts64.c new file mode 100644 index 0000000000..f2848fc3e4 --- /dev/null +++ b/sysdeps/wordsize-64/fts64.c @@ -0,0 +1 @@ +/* Defined in fts.c. */ |