Filter out redundant ioctl entries early

[strace] / io.c

diff --git a/io.c b/io.c
index 6b3f4b70d9f8c665198dd33a8690f5b1235c78d0..7238a8fabb548c95e0c29b12cf71436c2afa19bc 100644 (file)
--- a/io.c
+++ b/io.c
@@ -218,6 +218,26 @@ sys_pwrite(struct tcb *tcp)
 }
 
 #if HAVE_SYS_UIO_H
+
+static void
+print_llu_from_low_high_val(struct tcb *tcp, int arg)
+{
+#if SIZEOF_LONG == SIZEOF_LONG_LONG
+       tprintf("%lu", (unsigned long) tcp->u_arg[arg]);
+#elif defined(LINUX_MIPSN32)
+       tprintf("%llu", (unsigned long long) tcp->ext_arg[arg]);
+#else
+# ifdef X32
+       if (current_personality == 0)
+               tprintf("%llu", (unsigned long long) tcp->ext_arg[arg]);
+       else
+# endif
+       tprintf("%llu",
+               ((unsigned long long) (unsigned long) tcp->u_arg[arg + 1] << sizeof(long) * 8)
+               | (unsigned long long) (unsigned long) tcp->u_arg[arg]);
+#endif
+}
+
 int
 sys_preadv(struct tcb *tcp)
 {
@@ -231,7 +251,7 @@ sys_preadv(struct tcb *tcp)
                }
                tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
                tprintf(", %lu, ", tcp->u_arg[2]);
-               printllval(tcp, "%llu", PREAD_OFFSET_ARG);
+               print_llu_from_low_high_val(tcp, 3);
        }
        return 0;
 }
@@ -244,32 +264,47 @@ sys_pwritev(struct tcb *tcp)
                tprints(", ");
                tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
                tprintf(", %lu, ", tcp->u_arg[2]);
-               printllval(tcp, "%llu", PREAD_OFFSET_ARG);
+               print_llu_from_low_high_val(tcp, 3);
        }
        return 0;
 }
 #endif /* HAVE_SYS_UIO_H */
 
+static void
+print_off_t(struct tcb *tcp, long addr)
+{
+       unsigned long offset;
+
+       if (!addr) {
+               tprints("NULL");
+               return;
+       }
+
+#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
+       if (current_wordsize == 4) {
+               uint32_t off;
+
+               if (umove(tcp, addr, &off) < 0)
+                       tprintf("%#lx", addr);
+               else
+                       tprintf("[%u]", off);
+       } else
+#endif
+       if (umove(tcp, addr, &offset) < 0)
+               tprintf("%#lx", addr);
+       else
+               tprintf("[%lu]", offset);
+}
+
 int
 sys_sendfile(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               off_t offset;
-
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
                printfd(tcp, tcp->u_arg[1]);
                tprints(", ");
-               if (!tcp->u_arg[2])
-                       tprints("NULL");
-               else if (umove(tcp, tcp->u_arg[2], &offset) < 0)
-                       tprintf("%#lx", tcp->u_arg[2]);
-               else
-#ifdef HAVE_LONG_LONG_OFF_T
-                       tprintf("[%llu]", offset);
-#else
-                       tprintf("[%lu]", offset);
-#endif
+               print_off_t(tcp, tcp->u_arg[2]);
                tprintf(", %lu", tcp->u_arg[3]);
        }
        return 0;
@@ -302,21 +337,7 @@ sys_sendfile64(struct tcb *tcp)
        return 0;
 }
 
-static const struct xlat splice_flags[] = {
-#ifdef SPLICE_F_MOVE
-       { SPLICE_F_MOVE,     "SPLICE_F_MOVE"     },
-#endif
-#ifdef SPLICE_F_NONBLOCK
-       { SPLICE_F_NONBLOCK, "SPLICE_F_NONBLOCK" },
-#endif
-#ifdef SPLICE_F_MORE
-       { SPLICE_F_MORE,     "SPLICE_F_MORE"     },
-#endif
-#ifdef SPLICE_F_GIFT
-       { SPLICE_F_GIFT,     "SPLICE_F_GIFT"     },
-#endif
-       { 0,                 NULL                },
-};
+#include "xlat/splice_flags.h"
 
 int
 sys_tee(struct tcb *tcp)
@@ -379,7 +400,7 @@ sys_vmsplice(struct tcb *tcp)
 int
 sys_ioctl(struct tcb *tcp)
 {
-       const struct ioctlent *iop;
+       const struct_ioctlent *iop;
 
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);