[git commit] truncate: Use truncate64 if arch does not have the truncate syscall

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Wed Feb 20 12:45:12 UTC 2013


commit: http://git.uclibc.org/uClibc/commit/?id=f7bead5adac96d9cb72aa2fb3c11ca5ab8f5f6b9
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

Signed-off-by: Markos Chandras <markos.chandras at imgtec.com>

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 include/unistd.h                       |    1 +
 libc/sysdeps/linux/common/truncate.c   |   20 ++++++++++++++++++++
 libc/sysdeps/linux/common/truncate64.c |    4 +++-
 3 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/include/unistd.h b/include/unistd.h
index 8f2a09a..540062a 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -1110,6 +1110,7 @@ extern int __REDIRECT_NTH (truncate,
 # ifdef __USE_LARGEFILE64
 extern int truncate64 (const char *__file, __off64_t __length)
      __THROW __nonnull ((1)) __wur;
+libc_hidden_proto(truncate64)
 # endif
 
 #endif /* Use BSD || X/Open Unix.  */
diff --git a/libc/sysdeps/linux/common/truncate.c b/libc/sysdeps/linux/common/truncate.c
index fe7bda9..0c533df 100644
--- a/libc/sysdeps/linux/common/truncate.c
+++ b/libc/sysdeps/linux/common/truncate.c
@@ -10,5 +10,25 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
+#if defined(__NR_truncate64) && !defined(__NR_truncate)
+# include <endian.h>
+# include <stdint.h>
+
+int truncate(const char *path, __off_t length)
+{
+# if defined __UCLIBC_HAS_LFS
+	return truncate64(path, length);
+# elif __WORDSIZE == 32
+#  if defined(__UCLIBC_TRUNCATE64_HAS_4_ARGS__)
+	return INLINE_SYSCALL(truncate64, 4, path, 0, OFF_HI_LO(length));
+#  else
+	return INLINE_SYSCALL(truncate64, 3, path, OFF_HI_LO(length));
+#  endif
+# endif
+}
+libc_hidden_def(truncate);
+
+#else
 _syscall2(int, truncate, const char *, path, __off_t, length)
 libc_hidden_def(truncate)
+#endif
diff --git a/libc/sysdeps/linux/common/truncate64.c b/libc/sysdeps/linux/common/truncate64.c
index 6dfdc4c..1f5f862 100644
--- a/libc/sysdeps/linux/common/truncate64.c
+++ b/libc/sysdeps/linux/common/truncate64.c
@@ -52,4 +52,6 @@ int truncate64(const char * path, __off64_t length)
 
 	return -1;
 }
-#endif
+
+#endif /* __NR_truncate64 */
+libc_hidden_def(truncate64)


More information about the uClibc-cvs mailing list