From 44b24a7a32372081048cb1d5a86f9b7c3ce59a43 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 21 Jul 2004 10:00:04 +0000 Subject: Fix ftruncate64 and truncate64 for powerpc and mips -Erik --- libc/sysdeps/linux/common/ftruncate64.c | 19 ++++++++++++--- libc/sysdeps/linux/common/truncate64.c | 43 +++++++++++++++++++++++++++------ 2 files changed, 52 insertions(+), 10 deletions(-) (limited to 'libc') diff --git a/libc/sysdeps/linux/common/ftruncate64.c b/libc/sysdeps/linux/common/ftruncate64.c index 61ca9339e..3cbc9a799 100644 --- a/libc/sysdeps/linux/common/ftruncate64.c +++ b/libc/sysdeps/linux/common/ftruncate64.c @@ -17,13 +17,14 @@ #include #include #include +#include #include #if defined __UCLIBC_HAS_LFS__ #if defined __NR_ftruncate64 -#if __WORDSIZE == 64 || (defined(__powerpc__) && defined (__UCLIBC_HAS_LFS__)) +#if __WORDSIZE == 64 /* For a 64 bit machine, life is simple... */ _syscall2(int, ftruncate64, int, fd, __off64_t, length); @@ -33,7 +34,13 @@ _syscall2(int, ftruncate64, int, fd, __off64_t, length); #ifndef INLINE_SYSCALL #define INLINE_SYSCALL(name, nr, args...) __syscall_ftruncate64 (args) #define __NR___syscall_ftruncate64 __NR_ftruncate64 -static inline _syscall3(int, __syscall_ftruncate64, int, fd, int, high_length, int, low_length); +#if defined(__powerpc__) || defined(__mips__) +static inline _syscall4(int, __syscall_ftruncate64, int, fd, uint32_t, pad, + unsigned long, high_length, unsigned long, low_length); +#else +static inline _syscall3(int, __syscall_ftruncate64, int, fd, + unsigned long, high_length, unsigned long, low_length); +#endif #endif /* The exported ftruncate64 function. */ @@ -41,7 +48,13 @@ int ftruncate64 (int fd, __off64_t length) { uint32_t low = length & 0xffffffff; uint32_t high = length >> 32; - return INLINE_SYSCALL(ftruncate64, 3, fd, __LONG_LONG_PAIR (high, low)); +#if defined(__powerpc__) || defined(__mips__) + return INLINE_SYSCALL(ftruncate64, + 4, fd, 0, __LONG_LONG_PAIR (high, low)); +#else + return INLINE_SYSCALL(ftruncate64, 3, fd, + __LONG_LONG_PAIR (high, low)); +#endif } #else /* __WORDSIZE */ diff --git a/libc/sysdeps/linux/common/truncate64.c b/libc/sysdeps/linux/common/truncate64.c index ba6d95d1d..cf74812d6 100644 --- a/libc/sysdeps/linux/common/truncate64.c +++ b/libc/sysdeps/linux/common/truncate64.c @@ -17,23 +17,30 @@ #include #include #include +#include #include +#if defined __UCLIBC_HAS_LFS__ + #if defined __NR_truncate64 -#if __WORDSIZE == 64 || (defined(__powerpc__) && defined (__UCLIBC_HAS_LFS__)) +#if __WORDSIZE == 64 /* For a 64 bit machine, life is simple... */ _syscall2(int, truncate64, const char *, path, __off64_t, length); #elif __WORDSIZE == 32 -#if defined __UCLIBC_HAS_LFS__ - #ifndef INLINE_SYSCALL #define INLINE_SYSCALL(name, nr, args...) __syscall_truncate64 (args) #define __NR___syscall_truncate64 __NR_truncate64 -static inline _syscall3(int, __syscall_truncate64, const char *, path, int, high_length, int, low_length); +#if defined(__powerpc__) || defined(__mips__) +static inline _syscall4(int, __syscall_truncate64, const char *, path, + uint32_t, pad, unsigned long, high_length, unsigned long, low_length); +#else +static inline _syscall3(int, __syscall_truncate64, const char *, path, + unsigned long, high_length, unsigned long, low_length); +#endif #endif @@ -42,13 +49,35 @@ int truncate64 (const char * path, __off64_t length) { uint32_t low = length & 0xffffffff; uint32_t high = length >> 32; - return INLINE_SYSCALL(truncate64, 3, path, __LONG_LONG_PAIR (high, low)); +#if defined(__powerpc__) || defined(__mips__) + return INLINE_SYSCALL(truncate64, 4, path, 0, + __LONG_LONG_PAIR (high, low)); +#else + return INLINE_SYSCALL(truncate64, 3, path, + __LONG_LONG_PAIR (high, low)); +#endif } -#endif /* __UCLIBC_HAS_LFS__ */ #else /* __WORDSIZE */ #error Your machine is not 64 bit or 32 bit, I am dazed and confused. #endif /* __WORDSIZE */ -#endif +#else /* __NR_truncate64 */ + +int truncate64 (const char * path, __off64_t length) +{ + __off_t x = (__off_t) length; + + if (x == length) { + return truncate(path, x); + } + + __set_errno((x < 0) ? EINVAL : EFBIG); + + return -1; +} + +#endif /* __NR_truncate64 */ + +#endif /* __UCLIBC_HAS_LFS__ */ -- cgit v1.2.3