From: Dmitry V. Levin <ldv@altlinux.org>
Date: Mon, 20 Jul 2015 15:20:46 +0000 (+0000)
Subject: execve.c: make use of RVAL_DECODED
X-Git-Tag: v4.11~364
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e56b4e5ae7b8b59b57bcb3b568b3ae31f66d725;p=strace

execve.c: make use of RVAL_DECODED

* execve.c (sys_execve, sys_execv): Update for RVAL_DECODED.
---

diff --git a/execve.c b/execve.c
index c2f3c0e8..2e819cf7 100644
--- a/execve.c
+++ b/execve.c
@@ -42,46 +42,44 @@ printargc(const char *fmt, struct tcb *tcp, long addr)
 
 SYS_FUNC(execve)
 {
-	if (entering(tcp)) {
-		printpath(tcp, tcp->u_arg[0]);
-		tprints(", ");
+	printpath(tcp, tcp->u_arg[0]);
+	tprints(", ");
 
-		if (!tcp->u_arg[1] || !verbose(tcp))
-			printaddr(tcp->u_arg[1]);
-		else {
-			tprints("[");
-			printargv(tcp, tcp->u_arg[1]);
-			tprints("]");
-		}
-		tprints(", ");
+	if (!tcp->u_arg[1] || !verbose(tcp))
+		printaddr(tcp->u_arg[1]);
+	else {
+		tprints("[");
+		printargv(tcp, tcp->u_arg[1]);
+		tprints("]");
+	}
+	tprints(", ");
 
-		if (!tcp->u_arg[2] || !verbose(tcp))
-			printaddr(tcp->u_arg[2]);
-		else if (abbrev(tcp))
-			printargc("[/* %d var%s */]", tcp, tcp->u_arg[2]);
-		else {
-			tprints("[");
-			printargv(tcp, tcp->u_arg[2]);
-			tprints("]");
-		}
+	if (!tcp->u_arg[2] || !verbose(tcp))
+		printaddr(tcp->u_arg[2]);
+	else if (abbrev(tcp))
+		printargc("[/* %d var%s */]", tcp, tcp->u_arg[2]);
+	else {
+		tprints("[");
+		printargv(tcp, tcp->u_arg[2]);
+		tprints("]");
 	}
-	return 0;
+
+	return RVAL_DECODED;
 }
 
 #if defined(SPARC) || defined(SPARC64)
 SYS_FUNC(execv)
 {
-	if (entering(tcp)) {
-		printpath(tcp, tcp->u_arg[0]);
-		tprints(", ");
-		if (!tcp->u_arg[1] || !verbose(tcp))
-			printaddr(tcp->u_arg[1]);
-		else {
-			tprints("[");
-			printargv(tcp, tcp->u_arg[1]);
-			tprints("]");
-		}
+	printpath(tcp, tcp->u_arg[0]);
+	tprints(", ");
+	if (!tcp->u_arg[1] || !verbose(tcp))
+		printaddr(tcp->u_arg[1]);
+	else {
+		tprints("[");
+		printargv(tcp, tcp->u_arg[1]);
+		tprints("]");
 	}
-	return 0;
+
+	return RVAL_DECODED;
 }
 #endif /* SPARC || SPARC64 */