Remove linux/ptp_clock.h

[strace] / execve.c

diff --git a/execve.c b/execve.c
index d2ff9f740435cf96320d61b3df8be1d4f5eaf6db..5455b153420da65a1945cc9579b476d676266228 100644 (file)
--- a/execve.c
+++ b/execve.c
@@ -6,6 +6,7 @@
  * Copyright (c) 2007 Roland McGrath <roland@redhat.com>
  * Copyright (c) 2011-2012 Denys Vlasenko <vda.linux@googlemail.com>
  * Copyright (c) 2010-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,7 +35,7 @@
 #include "defs.h"
 
 static void
-printargv(struct tcb *tcp, long addr)
+printargv(struct tcb *const tcp, kernel_ulong_t addr)
 {
        if (!addr || !verbose(tcp)) {
                printaddr(addr);
@@ -49,8 +50,8 @@ printargv(struct tcb *tcp, long addr)
        for (n = 0; addr; sep = ", ", addr += wordsize, ++n) {
                union {
                        unsigned int p32;
-                       unsigned long p64;
-                       char data[sizeof(long)];
+                       kernel_ulong_t p64;
+                       char data[sizeof(kernel_ulong_t)];
                } cp;
 
                if (umoven(tcp, addr, wordsize, cp.data)) {
@@ -70,18 +71,18 @@ printargv(struct tcb *tcp, long addr)
                        break;
                }
                tprints(sep);
-               printstr(tcp, wordsize < sizeof(cp.p64) ? cp.p32 : cp.p64, -1);
+               printstr(tcp, wordsize < sizeof(cp.p64) ? cp.p32 : cp.p64);
        }
        tprints("]");
 }
 
 static void
-printargc(struct tcb *tcp, long addr)
+printargc(struct tcb *const tcp, kernel_ulong_t addr)
 {
-       if (!addr || !verbose(tcp)) {
-               printaddr(addr);
+       printaddr(addr);
+
+       if (!addr || !verbose(tcp))
                return;
-       }
 
        bool unterminated = false;
        unsigned int count = 0;
@@ -89,17 +90,16 @@ printargc(struct tcb *tcp, long addr)
 
        for (; addr; addr += current_wordsize, ++count) {
                if (umoven(tcp, addr, current_wordsize, &cp)) {
-                       if (count) {
-                               unterminated = true;
-                               break;
-                       }
-                       printaddr(addr);
-                       return;
+                       if (!count)
+                               return;
+
+                       unterminated = true;
+                       break;
                }
                if (!cp)
                        break;
        }
-       tprintf("[/* %u var%s%s */]",
+       tprintf_comment("%u var%s%s",
                count, count == 1 ? "" : "s",
                unterminated ? ", unterminated" : "");
 }