tests: check decoding of prctl PR_GET_TID_ADDRESS operation

[strace] / utime.c

diff --git a/utime.c b/utime.c
index af286a43f40f59e8f7ea796d3bd9c4e93c6eadd0..8126b350f25abcfb6a0d93b012c40a2e2dbe4626 100644 (file)
--- a/utime.c
+++ b/utime.c
@@ -1,36 +1,23 @@
 #include "defs.h"
 
+#include DEF_MPERS_TYPE(utimbuf_t)
+
+#include <utime.h>
+
+typedef struct utimbuf utimbuf_t;
+
+#include MPERS_DEFS
+
 SYS_FUNC(utime)
 {
-       union {
-               long utl[2];
-               int uti[2];
-               long paranoia_for_huge_wordsize[4];
-       } u;
-       unsigned wordsize;
-
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
+       utimbuf_t u;
 
-               wordsize = current_wordsize;
-               if (!tcp->u_arg[1])
-                       tprints("NULL");
-               else if (!verbose(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
-               else if (umoven(tcp, tcp->u_arg[1], 2 * wordsize, &u) < 0)
-                       tprints("[?, ?]");
-               else if (wordsize == sizeof u.utl[0]) {
-                       tprintf("[%s,", sprinttime(u.utl[0]));
-                       tprintf(" %s]", sprinttime(u.utl[1]));
-               }
-               else if (wordsize == sizeof u.uti[0]) {
-                       tprintf("[%s,", sprinttime(u.uti[0]));
-                       tprintf(" %s]", sprinttime(u.uti[1]));
-               }
-               else
-                       tprintf("<decode error: unsupported wordsize %d>",
-                               wordsize);
+       printpath(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       if (!umove_or_printaddr(tcp, tcp->u_arg[1], &u)) {
+               tprintf("{actime=%s,", sprinttime(u.actime));
+               tprintf(" modtime=%s}", sprinttime(u.modtime));
        }
-       return 0;
+
+       return RVAL_DECODED;
 }