kcmp: output fds using a separate function

[strace] / kcmp.c

diff --git a/kcmp.c b/kcmp.c
index 4668b48f11d44e951372eb19c5420015223414ed..e1c6e9ed0532bd299c201f0a3b2ff99011a46d96 100644 (file)
--- a/kcmp.c
+++ b/kcmp.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,22 +27,43 @@
  */
 
 #include "defs.h"
+#include "print_fields.h"
 #include "xlat/kcmp_types.h"
 
+static void
+printpidfd(struct tcb *tcp, pid_t pid, int fd)
+{
+       /*
+        * XXX We want to use printfd here, but we should figure out which
+        *     process in strace's PID NS is referred to first.
+        */
+       tprintf("%d", fd);
+}
+
+#define PRINT_FIELD_PIDFD(prefix_, where_, field_, tcp_, pid_)         \
+       do {                                                            \
+               STRACE_PRINTF("%s%s=", (prefix_), #field_);             \
+               printpidfd((tcp_), (pid_), (where_).field_);            \
+       } while (0)
+
 SYS_FUNC(kcmp)
 {
        pid_t pid1 = tcp->u_arg[0];
        pid_t pid2 = tcp->u_arg[1];
        int type = tcp->u_arg[2];
-       unsigned long long idx1 = getarg_ull(tcp, 3);
-       unsigned long long idx2 = getarg_ull(tcp, 4);
+       kernel_ulong_t idx1 = tcp->u_arg[3];
+       kernel_ulong_t idx2 = tcp->u_arg[4];
 
        tprintf("%d, %d, ", pid1, pid2);
        printxval(kcmp_types, type, "KCMP_???");
 
-       switch(type) {
+       switch (type) {
                case KCMP_FILE:
-                       tprintf(", %u, %u", (unsigned) idx1, (unsigned) idx2);
+                       tprints(", ");
+                       printpidfd(tcp, pid1, idx1);
+                       tprints(", ");
+                       printpidfd(tcp, pid1, idx2);
+
                        break;
                case KCMP_FILES:
                case KCMP_FS:
@@ -51,7 +73,7 @@ SYS_FUNC(kcmp)
                case KCMP_VM:
                        break;
                default:
-                       tprintf(", %#llx, %#llx", idx1, idx2);
+                       tprintf(", %#" PRI_klx ", %#" PRI_klx, idx1, idx2);
        }
 
        return RVAL_DECODED;