]> granicus.if.org Git - strace/commitdiff
execve.c: make use of RVAL_DECODED
authorDmitry V. Levin <ldv@altlinux.org>
Mon, 20 Jul 2015 15:20:46 +0000 (15:20 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Mon, 20 Jul 2015 22:03:07 +0000 (22:03 +0000)
* execve.c (sys_execve, sys_execv): Update for RVAL_DECODED.

execve.c

index c2f3c0e8e886bb7210fe472e3166908c18d096dd..2e819cf76db11089cda85607fcf8c084fd5ecc73 100644 (file)
--- 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 */