From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sat, 10 Mar 2012 14:03:25 +0000 (+0000)
Subject: Output iovec length in vmsplice and process_vm_readv decoders
X-Git-Tag: v4.7~133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bfd74436d3945e915d373364bbed1f08d3d3c38;p=strace

Output iovec length in vmsplice and process_vm_readv decoders

* io.c (sys_vmsplice): Output iovec length.
* process.c (sys_process_vm_readv): Likewise.
---

diff --git a/io.c b/io.c
index 8f2b45ab..9dd869a4 100644
--- a/io.c
+++ b/io.c
@@ -361,7 +361,7 @@ sys_vmsplice(struct tcb *tcp)
 		tprints(", ");
 		/* const struct iovec *iov, unsigned long nr_segs */
 		tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
-		tprints(", ");
+		tprintf(", %lu, ", tcp->u_arg[2]);
 		/* unsigned int flags */
 		printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
 	}
diff --git a/process.c b/process.c
index a6705ec9..39e6f781 100644
--- a/process.c
+++ b/process.c
@@ -2754,22 +2754,23 @@ sys_process_vm_readv(struct tcb *tcp)
 		/* arg 1: pid */
 		tprintf("%ld, ", tcp->u_arg[0]);
 	} else {
-		/* args 2,3: local iov,cnt */
+		/* arg 2: local iov */
 		if (syserror(tcp)) {
-			tprintf("%#lx, %lu",
-					tcp->u_arg[1], tcp->u_arg[2]);
+			tprintf("%#lx", tcp->u_arg[1]);
 		} else {
 			tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
 		}
-		tprints(", ");
-		/* args 4,5: remote iov,cnt */
+		/* arg 3: local iovcnt */
+		tprintf(", %lu, ", tcp->u_arg[2]);
+		/* arg 4: remote iov */
 		if (syserror(tcp)) {
-			tprintf("%#lx, %lu", tcp->u_arg[3], tcp->u_arg[4]);
+			tprintf("%#lx", tcp->u_arg[3]);
 		} else {
 			tprint_iov(tcp, tcp->u_arg[4], tcp->u_arg[3], 0);
 		}
+		/* arg 5: remote iovcnt */
 		/* arg 6: flags */
-		tprintf(", %lu", tcp->u_arg[5]);
+		tprintf(", %lu, %lu", tcp->u_arg[4], tcp->u_arg[5]);
 	}
 	return 0;
 }