[uClibc-cvs] CVS update of uClibc/libc/sysdeps/linux/common (ftruncate64.c truncate64.c)

[Erik Andersen]

    Date: Wednesday, July 21, 2004 @ 04:00:04
  Author: andersen
    Path: /var/cvs/uClibc/libc/sysdeps/linux/common

Modified: ftruncate64.c (1.10 -> 1.11) truncate64.c (1.8 -> 1.9)

Fix ftruncate64 and truncate64 for powerpc and mips
 -Erik


Index: uClibc/libc/sysdeps/linux/common/ftruncate64.c
diff -u uClibc/libc/sysdeps/linux/common/ftruncate64.c:1.10 uClibc/libc/sysdeps/linux/common/ftruncate64.c:1.11
--- uClibc/libc/sysdeps/linux/common/ftruncate64.c:1.10	Sun Nov 16 18:24:07 2003
+++ uClibc/libc/sysdeps/linux/common/ftruncate64.c	Wed Jul 21 04:00:04 2004
@@ -17,13 +17,14 @@
 #include <errno.h>
 #include <endian.h>
 #include <stdint.h>
+#include <sys/types.h>
 #include <sys/syscall.h>
 
 #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 @@
 #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 @@
 {
     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 */
Index: uClibc/libc/sysdeps/linux/common/truncate64.c
diff -u uClibc/libc/sysdeps/linux/common/truncate64.c:1.8 uClibc/libc/sysdeps/linux/common/truncate64.c:1.9
--- uClibc/libc/sysdeps/linux/common/truncate64.c:1.8	Fri Nov 15 07:06:44 2002
+++ uClibc/libc/sysdeps/linux/common/truncate64.c	Wed Jul 21 04:00:04 2004
@@ -17,23 +17,30 @@
 #include <errno.h>
 #include <endian.h>
 #include <stdint.h>
+#include <sys/types.h>
 #include <sys/syscall.h>
 
+#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 @@
 {
     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__ */