sock: cast pointers to kernel_ureg_t instead of unsigned long

[strace] / mq.c

diff --git a/mq.c b/mq.c
index 464045ff75bf091cb24e24cad42a16d502ae67d0..c1d47ab1125053e972e3b4c6c1f25c04d684e58f 100644 (file)
--- a/mq.c
+++ b/mq.c
@@ -29,8 +29,6 @@
 #include "defs.h"
 #include <fcntl.h>
 
-extern void printmqattr(struct tcb *tcp, const long addr);
-
 SYS_FUNC(mq_open)
 {
        printpath(tcp, tcp->u_arg[0]);
@@ -39,47 +37,63 @@ SYS_FUNC(mq_open)
        tprint_open_modes(tcp->u_arg[1]);
        if (tcp->u_arg[1] & O_CREAT) {
                /* mode */
-               tprintf(", %#lo, ", tcp->u_arg[2]);
-               printmqattr(tcp, tcp->u_arg[3]);
+               tprints(", ");
+               print_numeric_umode_t(tcp->u_arg[2]);
+               tprints(", ");
+               printmqattr(tcp, tcp->u_arg[3], false);
        }
        return RVAL_DECODED;
 }
 
 SYS_FUNC(mq_timedsend)
 {
-       tprintf("%ld, ", tcp->u_arg[0]);
+       tprintf("%d, ", (int) tcp->u_arg[0]);
        printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-       tprintf(", %lu, %ld, ", tcp->u_arg[2], tcp->u_arg[3]);
-       printtv(tcp, tcp->u_arg[4]);
+       tprintf(", %" PRI_klu ", %u, ", getarg_klu(tcp, 2),
+               (unsigned int) tcp->u_arg[3]);
+       print_timespec(tcp, tcp->u_arg[4]);
        return RVAL_DECODED;
 }
 
 SYS_FUNC(mq_timedreceive)
 {
-       if (entering(tcp))
-               tprintf("%ld, ", tcp->u_arg[0]);
-       else {
-               printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu, %ld, ", tcp->u_arg[2], tcp->u_arg[3]);
-               printtv(tcp, tcp->u_arg[4]);
+       if (entering(tcp)) {
+               tprintf("%d, ", (int) tcp->u_arg[0]);
+       } else {
+               if (!syserror(tcp) && (tcp->u_rval >= 0))
+                       printstr(tcp, tcp->u_arg[1], tcp->u_rval);
+               else
+                       printaddr(tcp->u_arg[1]);
+               tprintf(", %" PRI_klu ", ", getarg_klu(tcp, 2));
+               printnum_int(tcp, tcp->u_arg[3], "%u");
+               tprintf(", ");
+               /*
+                * Since the timeout parameter is read by the kernel
+                * on entering syscall, it has to be decoded the same way
+                * whether the syscall has failed or not.
+                */
+               temporarily_clear_syserror(tcp);
+               print_timespec(tcp, tcp->u_arg[4]);
+               restore_cleared_syserror(tcp);
        }
        return 0;
 }
 
 SYS_FUNC(mq_notify)
 {
-       tprintf("%ld, ", tcp->u_arg[0]);
-       printsigevent(tcp, tcp->u_arg[1]);
+       tprintf("%d, ", (int) tcp->u_arg[0]);
+       print_sigevent(tcp, tcp->u_arg[1]);
        return RVAL_DECODED;
 }
 
 SYS_FUNC(mq_getsetattr)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printmqattr(tcp, tcp->u_arg[1]);
+               tprintf("%d, ", (int) tcp->u_arg[0]);
+               printmqattr(tcp, tcp->u_arg[1], true);
                tprints(", ");
-       } else
-               printmqattr(tcp, tcp->u_arg[2]);
+       } else {
+               printmqattr(tcp, tcp->u_arg[2], true);
+       }
        return 0;
 }