Remove from syscalls.c, leave just ftruncate64.c and truncate64.c

which have implementations that works...
 -Erik

3 files changed, 43 insertions, 28 deletions

diff --git a/libc/sysdeps/linux/common/ftruncate64.c b/libc/sysdeps/linux/common/ftruncate64.c
index 0b87eb58a..79eb628f0 100644
--- a/libc/sysdeps/linux/common/ftruncate64.c
+++ b/libc/sysdeps/linux/common/ftruncate64.c
@@ -20,10 +20,10 @@
 #include <sys/syscall.h>
 
 #if defined __UCLIBC_HAVE_LFS__ && defined __NR_ftruncate64
-#if (__WORDSIZE == 64)
+#if __WORDSIZE == 64
 /* For a 64 bit machine, life is simple... */
 _syscall2(int, ftruncate64, int, fd, __off64_t, length);
-#elif (__WORDSIZE == 32)
+#elif __WORDSIZE == 32
 #define __NR___ftruncate64 __NR_ftruncate64
 static inline _syscall3(int, __ftruncate64, int, fd, int, high_length, int, low_length);
 /* The exported ftruncate64 function.  */
diff --git a/libc/sysdeps/linux/common/syscalls.c b/libc/sysdeps/linux/common/syscalls.c
index 9c416fe2f..2f2d9fd59 100644
--- a/libc/sysdeps/linux/common/syscalls.c
+++ b/libc/sysdeps/linux/common/syscalls.c
@@ -1465,34 +1465,10 @@ int getrlimit (__rlimit_resource_t resource, struct rlimit *rlimits)
 
 
 //#define __NR_truncate64         193
-#ifdef L_truncate64
-#ifdef __UCLIBC_HAVE_LFS__
-#include <bits/wordsize.h>
-/* Using _syscall2 to pass 64-bit arguments generally only works on 64-bit 
- * systems, so we only implement truncate64/ftruncate64 in that case.  Ports 
- * for processors with shorter word-lengths should define their own custom 
- * versions instead.  */
-#if __WORDSIZE >= 64
-#include <unistd.h>
-_syscall2(int, truncate64, const char *, path, __off64_t, length);
-#endif /* __WORDSIZE >= 64 */
-#endif /* __UCLIBC_HAVE_LFS__ */
-#endif
+//See libc/sysdeps/linux/common/truncate64.c
 
 //#define __NR_ftruncate64        194
-#ifdef L_ftruncate64
-#ifdef __UCLIBC_HAVE_LFS__
-#include <bits/wordsize.h>
-/* Using _syscall2 to pass 64-bit arguments generally only works on 64-bit 
- * systems, so we only implement truncate64/ftruncate64 in that case.  Ports 
- * for processors with shorter word-lengths should define their own custom 
- * versions instead.  */
-#if __WORDSIZE >= 64
-#include <unistd.h>
-_syscall2(int, ftruncate64, int, fd, __off64_t, length);
-#endif /* __WORDSIZE >= 64 */
-#endif /* __UCLIBC_HAVE_LFS__ */
-#endif
+//See libc/sysdeps/linux/common/ftruncate64.c
 
 
 //#define __NR_stat64             195
diff --git a/libc/sysdeps/linux/common/truncate64.c b/libc/sysdeps/linux/common/truncate64.c
new file mode 100644
index 000000000..8c7d8bb5a
--- /dev/null
+++ b/libc/sysdeps/linux/common/truncate64.c
@@ -0,0 +1,39 @@
+/*
+ * truncate64 syscall.  Copes with 64 bit and 32 bit machines
+ * and on 32 bit machines this sends things into the kernel as
+ * two 32-bit arguments (high and low 32 bits of length) that 
+ * are ordered based on endianess.  It turns out endian.h has
+ * just the macro we need to order things (__LONG_LONG_PAIR).
+ *
+ *  Copyright (C) 2002  Erik Andersen <andersen@codepoet.org>
+ *
+ * This file is subject to the terms and conditions of the GNU
+ * Lesser General Public License.  See the file COPYING.LIB in
+ * the main directory of this archive for more details.
+ */
+
+#include <features.h>
+#include <unistd.h>
+#include <errno.h>
+#include <endian.h>
+#include <stdint.h>
+#include <sys/syscall.h>
+
+#if defined __UCLIBC_HAVE_LFS__ && defined __NR_truncate64
+#if __WORDSIZE == 64
+/* For a 64 bit machine, life is simple... */
+_syscall2(int, truncate64, const char *, path, __off64_t, length);
+#elif __WORDSIZE == 32
+#define __NR___truncate64 __NR_truncate64
+static inline _syscall3(int, __truncate64, const char *, path, int, high_length, int, low_length);
+/* The exported truncate64 function.  */
+int truncate64 (const char * path, __off64_t length)
+{
+    unsigned int low = length & 0xffffffff;
+    unsigned int high = length >> 32;
+    return __truncate64(path, __LONG_LONG_PAIR (high, low));
+}
+#else
+#error Your machine is not 64 bit or 32 bit, I am dazed and confused.
+#endif
+#endif /* __UCLIBC_HAVE_LFS__ */