[src/trunk]: src/usr.bin/vmstat when dumping a kernhist history replace "%s" ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7f63e5cfa083
branches:  trunk
changeset: 998953:7f63e5cfa083
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu May 09 08:01:07 2019 +0000

description:
when dumping a kernhist history replace "%s" with "%p" so that the
kernhist in kernel can be a little more usable without making the
userland dumping code crash.

diffstat:

 usr.bin/vmstat/vmstat.c |  25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diffs (72 lines):

diff -r f5aeb560be57 -r 7f63e5cfa083 usr.bin/vmstat/vmstat.c
--- a/usr.bin/vmstat/vmstat.c   Thu May 09 07:59:49 2019 +0000
+++ b/usr.bin/vmstat/vmstat.c   Thu May 09 08:01:07 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmstat.c,v 1.226 2019/04/30 23:29:18 simonb Exp $ */
+/* $NetBSD: vmstat.c,v 1.227 2019/05/09 08:01:07 mrg Exp $ */
 
 /*-
  * Copyright (c) 1998, 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
 #if 0
 static char sccsid[] = "@(#)vmstat.c   8.2 (Berkeley) 3/1/95";
 #else
-__RCSID("$NetBSD: vmstat.c,v 1.226 2019/04/30 23:29:18 simonb Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.227 2019/05/09 08:01:07 mrg Exp $");
 #endif
 #endif /* not lint */
 
@@ -2148,15 +2148,13 @@
                e = &histents[i];
                if (e->fmt != NULL) {
                        if (fmt == NULL || e->fmtlen > fmtlen) {
-                               if (fmt != NULL)
-                                       free(fmt);
+                               free(fmt);
                                fmtlen = e->fmtlen;
                                if ((fmt = malloc(fmtlen + 1)) == NULL)
                                        err(1, "malloc printf format");
                        }
                        if (fn == NULL || e->fnlen > fnlen) {
-                               if (fn != NULL)
-                                       free(fn);
+                               free(fn);
                                fnlen = e->fnlen;
                                if ((fn = malloc(fnlen + 1)) == NULL)
                                        err(1, "malloc function name");
@@ -2164,6 +2162,10 @@
 
                        deref_kptr(e->fmt, fmt, fmtlen, "printf format");
                        fmt[fmtlen] = '\0';
+                       for (unsigned z = 0; z < fmtlen - 1; z++) {
+                               if (fmt[z] == '%' && fmt[z+1] == 's')
+                                       fmt[z+1] = 'p';
+                       }
 
                        deref_kptr(e->fn, fn, fnlen, "function name");
                        fn[fnlen] = '\0';
@@ -2180,10 +2182,8 @@
        } while (i != histp->f);
 
        free(histents);
-       if (fmt != NULL)
-               free(fmt);
-       if (fn != NULL)
-               free(fn);
+       free(fmt);
+       free(fn);
 }
 
 void
@@ -2293,6 +2293,11 @@
                e = &hist->sh_events[i];
                if (e->she_fmtoffset != 0) {
                        fmt = &strp[e->she_fmtoffset];
+                       size_t fmtlen = strlen(fmt);
+                       for (unsigned z = 0; z < fmtlen - 1; z++) {
+                               if (fmt[z] == '%' && fmt[z+1] == 's')
+                                       fmt[z+1] = 'p';
+                       }
                        fn = &strp[e->she_funcoffset];
                        bintime2timeval(&e->she_bintime, &tv);
                        (void)printf("%06ld.%06ld %s#%"PRIu32"@%"PRIu32": ",