print_dirfd: do not print trailing comma

It was fine to print trailing comma in print_dirfd until introduction
of a syscall with the last argument being a dirfd.
Now it's time to change print_dirfd.

* open.c (print_dirfd): Do not print comma.
(SYS_FUNC(open)): Print comma after print_dirfd() invocation.
* access.c (SYS_FUNC(faccessat)): Likewise.
* chmod.c (SYS_FUNC(fchmodat)): Likewise.
* execve.c (SYS_FUNC(execveat)): Likewise.
* fanotify.c (SYS_FUNC(fanotify_mark)): Likewise.
* fchownat.c (SYS_FUNC(fchownat)): Likewise.
* file_handle.c (SYS_FUNC(name_to_handle_at)): Likewise.
* link.c (SYS_FUNC(linkat), SYS_FUNC(unlinkat), SYS_FUNC(symlinkat)):
Likewise.
* mknod.c (SYS_FUNC(mknodat)): Likewise.
* move_mount.c (SYS_FUNC(move_mount)): Likewise.
* open_tree.c (SYS_FUNC(open_tree)): Likewise.
* readlink.c (SYS_FUNC(readlinkat)): Likewise.
* renameat.c (decode_renameat): Likewise.
* stat.c (SYS_FUNC(newfstatat)): Likewise.
* stat64.c (SYS_FUNC(fstatat64)): Likewise.
* statx.c (SYS_FUNC(statx)): Likewise.
* utimes.c (SYS_FUNC(futimesat), do_utimensat): Likewise.

diff --git a/access.c b/access.c
index 5c2e6e99ea4aa675d4b4f6287a55a299c12c17f2..d05bd41b9a70c7752179ee89f4a6a06ec702f10d 100644 (file)
--- a/access.c
+++ b/access.c
@@ -29,5 +29,6 @@ SYS_FUNC(access)
 SYS_FUNC(faccessat)
 {
        print_dirfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
        return decode_access(tcp, 1);
 }

diff --git a/chmod.c b/chmod.c
index 7668e746c808b599d66a17aef2fb230e0326de93..8d105d9fad510d5cf3b49bbee2e834e99592550a 100644 (file)
--- a/chmod.c
+++ b/chmod.c
@@ -25,6 +25,7 @@ SYS_FUNC(chmod)
 SYS_FUNC(fchmodat)
 {
        print_dirfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
        decode_chmod(tcp, 1);
 
        return RVAL_DECODED;

diff --git a/execve.c b/execve.c
index b675cd26900a34278b47d5af7e7be26e081a1660..d7d5458bf8c9fac6843c9de3dc7fdd141d2bc3eb 100644 (file)
--- a/execve.c
+++ b/execve.c
@@ -109,6 +109,7 @@ SYS_FUNC(execve)
 SYS_FUNC(execveat)
 {
        print_dirfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
        decode_execve(tcp, 1);
        tprints(", ");
        printflags(at_flags, tcp->u_arg[4], "AT_???");

diff --git a/fanotify.c b/fanotify.c
index 9a0d5c628b3f57589fb16d10993a9382a9f297f7..e0edb7ff5d0d2df254c715613a8e438870d32518 100644 (file)
--- a/fanotify.c
+++ b/fanotify.c
@@ -55,12 +55,11 @@ SYS_FUNC(fanotify_mark)
 #endif
        printflags64(fan_event_flags, mask, "FAN_???");
        tprints(", ");
-       if ((int) tcp->u_arg[argn] == FAN_NOFD) {
+       if ((int) tcp->u_arg[argn] == FAN_NOFD)
                print_xlat_d(FAN_NOFD);
-               tprints(", ");
-       } else {
+       else
                print_dirfd(tcp, tcp->u_arg[argn]);
-       }
+       tprints(", ");
        printpath(tcp, tcp->u_arg[argn + 1]);
 
        return RVAL_DECODED;

diff --git a/fchownat.c b/fchownat.c
index 15fcb063665242767b17469b1f768b3a9dc887b0..fcdda8968fc146e2d8aedaefe542a64982165128 100644 (file)
--- a/fchownat.c
+++ b/fchownat.c
@@ -10,6 +10,7 @@
 SYS_FUNC(fchownat)
 {
        print_dirfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
        printpath(tcp, tcp->u_arg[1]);
        printuid(", ", tcp->u_arg[2]);
        printuid(", ", tcp->u_arg[3]);

diff --git a/file_handle.c b/file_handle.c
index 7ac135b0dad36518ff2af6f53bc56055ffd096e5..a38063c597b4e15b9080b1c2fe215e5cc77e1f86 100644 (file)
--- a/file_handle.c
+++ b/file_handle.c
@@ -27,6 +27,7 @@ SYS_FUNC(name_to_handle_at)
        if (entering(tcp)) {
                /* dirfd */
                print_dirfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
 
                /* pathname */
                printpath(tcp, tcp->u_arg[1]);

diff --git a/link.c b/link.c
index 3171f9f9a2c2254de22ce34f0d2fcdde973f17c5..74d715baada86230e3d3020617a42ee477553dba 100644 (file)
--- a/link.c
+++ b/link.c
@@ -29,9 +29,11 @@ SYS_FUNC(link)
 SYS_FUNC(linkat)
 {
        print_dirfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
        printpath(tcp, tcp->u_arg[1]);
        tprints(", ");
        print_dirfd(tcp, tcp->u_arg[2]);
+       tprints(", ");
        printpath(tcp, tcp->u_arg[3]);
        tprints(", ");
        printflags(at_flags, tcp->u_arg[4], "AT_???");
@@ -42,6 +44,7 @@ SYS_FUNC(linkat)
 SYS_FUNC(unlinkat)
 {
        print_dirfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
        printpath(tcp, tcp->u_arg[1]);
        tprints(", ");
        printflags(at_flags, tcp->u_arg[2], "AT_???");
@@ -54,6 +57,7 @@ SYS_FUNC(symlinkat)
        printpath(tcp, tcp->u_arg[0]);
        tprints(", ");
        print_dirfd(tcp, tcp->u_arg[1]);
+       tprints(", ");
        printpath(tcp, tcp->u_arg[2]);
 
        return RVAL_DECODED;

diff --git a/mknod.c b/mknod.c
index b01e6000bba6606ce90fd032f0047ec099e56b7e..4b4ff2a4560936ed78749fb9874311d36f1921d2 100644 (file)
--- a/mknod.c
+++ b/mknod.c
@@ -46,6 +46,7 @@ SYS_FUNC(mknod)
 SYS_FUNC(mknodat)
 {
        print_dirfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
        decode_mknod(tcp, 1);
 
        return RVAL_DECODED;

diff --git a/move_mount.c b/move_mount.c
index b299b73cc787a7cd5590d1d775ae65ed4fff1fef..df150114f0f1d738512c8e95fe09fac6b7b83cbd 100644 (file)
--- a/move_mount.c
+++ b/move_mount.c
@@ -14,9 +14,11 @@
 SYS_FUNC(move_mount)
 {
        print_dirfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
        printpath(tcp, tcp->u_arg[1]);
        tprints(", ");
        print_dirfd(tcp, tcp->u_arg[2]);
+       tprints(", ");
        printpath(tcp, tcp->u_arg[3]);
        tprints(", ");
        printflags(move_mount_flags, tcp->u_arg[4], "MOVE_MOUNT_???");

diff --git a/open.c b/open.c
index 153c93a231f5feeb98eeda956f566f48625bae17..01fd379866c01d6bdd3302200cf51a8727a68fdd 100644 (file)
--- a/open.c
+++ b/open.c
@@ -45,8 +45,6 @@ print_dirfd(struct tcb *tcp, int fd)
                print_xlat_d(AT_FDCWD);
        else
                printfd(tcp, fd);
-
-       tprints(", ");
 }
 
 /*
@@ -121,6 +119,7 @@ SYS_FUNC(open)
 SYS_FUNC(openat)
 {
        print_dirfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
        return decode_open(tcp, 1);
 }
 

diff --git a/open_tree.c b/open_tree.c
index 3d1173ad5868176502c2939ec46fdeac25068c71..15adec52bb0e7b2638c50edcc367213b17a81418 100644 (file)
--- a/open_tree.c
+++ b/open_tree.c
@@ -15,6 +15,7 @@
 SYS_FUNC(open_tree)
 {
        print_dirfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
        printpath(tcp, tcp->u_arg[1]);
        tprints(", ");
        printflags(open_tree_flags, tcp->u_arg[2], "OPEN_TREE_???");

diff --git a/readlink.c b/readlink.c
index 6a4920e42efbecd20e30f962dc9a080c6e49feff..02d254cea58a61203c01ef1947c4daa7e85582c9 100644 (file)
--- a/readlink.c
+++ b/readlink.c
@@ -44,7 +44,9 @@ SYS_FUNC(readlink)
 
 SYS_FUNC(readlinkat)
 {
-       if (entering(tcp))
+       if (entering(tcp)) {
                print_dirfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+       }
        return decode_readlink(tcp, 1);
 }

diff --git a/renameat.c b/renameat.c
index 8f7118de4dc738913e4ce595b12adf6a51331a0b..574303d2ab564a628edcf42bdbd362d207cdc67c 100644 (file)
--- a/renameat.c
+++ b/renameat.c
@@ -11,9 +11,11 @@ static void
 decode_renameat(struct tcb *tcp)
 {
        print_dirfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
        printpath(tcp, tcp->u_arg[1]);
        tprints(", ");
        print_dirfd(tcp, tcp->u_arg[2]);
+       tprints(", ");
        printpath(tcp, tcp->u_arg[3]);
 }
 

diff --git a/stat.c b/stat.c
index c7ad481119ae527b85221ed6d6766402b2d198b2..5d712c021a0e20312a4036cf1c599d83567cacaa 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -44,6 +44,7 @@ SYS_FUNC(newfstatat)
 {
        if (entering(tcp)) {
                print_dirfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
                printpath(tcp, tcp->u_arg[1]);
                tprints(", ");
        } else {

diff --git a/stat64.c b/stat64.c
index 62584728d048a381f7fc09e18c30cfa1c6bf5966..141e89b55574ca263bf96cb649fe919b4aebb6dd 100644 (file)
--- a/stat64.c
+++ b/stat64.c
@@ -44,6 +44,7 @@ SYS_FUNC(fstatat64)
 {
        if (entering(tcp)) {
                print_dirfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
                printpath(tcp, tcp->u_arg[1]);
                tprints(", ");
        } else {

diff --git a/statx.c b/statx.c
index 9cc30c4f701c7f4709b5e64b4d26674d2078780f..cc6bda8d1ccaacc11330bd1e0b67aaf7384930aa 100644 (file)
--- a/statx.c
+++ b/statx.c
@@ -19,6 +19,7 @@ SYS_FUNC(statx)
 {
        if (entering(tcp)) {
                print_dirfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
                printpath(tcp, tcp->u_arg[1]);
                tprints(", ");
 

diff --git a/utimes.c b/utimes.c
index bee7809867246f298e7f0dde2ba24e5c07043379..d969133a3aa9694ffe82bab93ccccd7c1574e274 100644 (file)
--- a/utimes.c
+++ b/utimes.c
@@ -26,6 +26,7 @@ SYS_FUNC(utimes)
 SYS_FUNC(futimesat)
 {
        print_dirfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
        printpath(tcp, tcp->u_arg[1]);
        tprints(", ");
        print_timeval_utimes(tcp, tcp->u_arg[2]);
@@ -37,6 +38,7 @@ static int
 do_utimensat(struct tcb *const tcp, const print_obj_by_addr_fn print_ts)
 {
        print_dirfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
        printpath(tcp, tcp->u_arg[1]);
        tprints(", ");
        print_ts(tcp, tcp->u_arg[2]);