nlattr: add UID/GID netlink attribute decoders

[strace] / mq.c

diff --git a/mq.c b/mq.c
index 5b46d478241dd5d213364a18d391ecfb3617bcaa..85438f17a8a8eff5408571d0e9542344c392f411 100644 (file)
--- a/mq.c
+++ b/mq.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2004 Ulrich Drepper <drepper@redhat.com>
  * Copyright (c) 2005-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2018 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,12 +43,13 @@ SYS_FUNC(mq_open)
                tprints(", ");
                printmqattr(tcp, tcp->u_arg[3], false);
        }
-       return RVAL_DECODED;
+       return RVAL_DECODED | RVAL_FD;
 }
 
 SYS_FUNC(mq_timedsend)
 {
-       tprintf("%d, ", (int) tcp->u_arg[0]);
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
        printstrn(tcp, tcp->u_arg[1], tcp->u_arg[2]);
        tprintf(", %" PRI_klu ", %u, ", tcp->u_arg[2],
                (unsigned int) tcp->u_arg[3]);
@@ -58,7 +60,8 @@ SYS_FUNC(mq_timedsend)
 SYS_FUNC(mq_timedreceive)
 {
        if (entering(tcp)) {
-               tprintf("%d, ", (int) tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
        } else {
                if (syserror(tcp))
                        printaddr(tcp->u_arg[1]);
@@ -66,7 +69,7 @@ SYS_FUNC(mq_timedreceive)
                        printstrn(tcp, tcp->u_arg[1], tcp->u_rval);
                tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
                printnum_int(tcp, tcp->u_arg[3], "%u");
-               tprintf(", ");
+               tprints(", ");
                /*
                 * Since the timeout parameter is read by the kernel
                 * on entering syscall, it has to be decoded the same way
@@ -81,7 +84,8 @@ SYS_FUNC(mq_timedreceive)
 
 SYS_FUNC(mq_notify)
 {
-       tprintf("%d, ", (int) tcp->u_arg[0]);
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
        print_sigevent(tcp, tcp->u_arg[1]);
        return RVAL_DECODED;
 }
@@ -89,7 +93,8 @@ SYS_FUNC(mq_notify)
 SYS_FUNC(mq_getsetattr)
 {
        if (entering(tcp)) {
-               tprintf("%d, ", (int) tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
                printmqattr(tcp, tcp->u_arg[1], true);
                tprints(", ");
        } else {