summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2013-02-18 15:47:57 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2013-02-18 15:47:57 +0100
commit8435d672ebbc318648a54beef1d491f1ce0531a3 (patch)
tree0caa9cca9629c46f3bdb6ccdf0cbe31662b06253 /io.c
parent8dedb0dc9636f64d6d1865a55d06a6fb6c4a04a9 (diff)
downloadstrace-8435d672ebbc318648a54beef1d491f1ce0531a3.tar.gz
strace-8435d672ebbc318648a54beef1d491f1ce0531a3.tar.bz2
strace-8435d672ebbc318648a54beef1d491f1ce0531a3.tar.xz
Remove code which supports systems with long long off_t.
While looking at mmap mess, did experimenting in order to figure out what gets used when. Tried building armv4tl, armv5l, armv6l, mips, mipsel, i686, x86_64 and none of they have long long off_t, which isn't suprprising: we aren't using glibc defines which enable that. Moreover, we SHOULD NOT use off_t in syscall decode! Its size depends on libc, not on arch! I.e. it is essentially unpredictable and can even in theory vary on the same arch with different libc. We should use longs or long longs, in a way which matches architectural ABI for the given syscall. There are usually *at most* two permutations, no need to add yet another variable (sizeof(off_t)) to the mix. This change removes almost all HAVE_LONG_LONG_OFF_T conditionals, which will reveal further possible simplifications. * mem.c: Remove code conditional on HAVE_LONG_LONG_OFF_T. As a result, never remap sys_mmap64 to sys_mmap. (print_mmap): Compile unconditionally. (sys_old_mmap): Compile unconditionally. (sys_mmap): Compile unconditionally. * io.c (sys_sendfile): Add a FIXME comment. * file.c: Remove code conditional on HAVE_LONG_LONG_OFF_T. As a result, never remap sys_*stat64 to sys_*stat etc. (sys_truncate): Compile unconditionally. (realprintstat): Likewise. (sys_stat): Likewise. (sys_fstat): Likewise. (sys_lstat): Likewise. * desc.c (printflock): Likewise. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'io.c')
-rw-r--r--io.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/io.c b/io.c
index 6b3f4b7..f0f0756 100644
--- a/io.c
+++ b/io.c
@@ -262,6 +262,10 @@ sys_sendfile(struct tcb *tcp)
tprints(", ");
if (!tcp->u_arg[2])
tprints("NULL");
+//FIXME: obviously bogus.
+//Probably should use explicit long.
+//Arches with long long offset param should use
+//sys_sendfile64, not this fn.
else if (umove(tcp, tcp->u_arg[2], &offset) < 0)
tprintf("%#lx", tcp->u_arg[2]);
else