From cd701b82785926ffbb50c4acfc3643867eee085f Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Thu, 10 Nov 2022 08:17:53 +0000
Subject: [PATCH] change default output to -a format; ok tb

---
 usr.sbin/procmap/procmap.1 | 8 ++++----
 usr.sbin/procmap/procmap.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr.sbin/procmap/procmap.1 b/usr.sbin/procmap/procmap.1
index 4e867dfa6bf..858a3cec87c 100644
--- a/usr.sbin/procmap/procmap.1
+++ b/usr.sbin/procmap/procmap.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: procmap.1,v 1.25 2022/10/22 06:39:12 jmc Exp $
+.\"	$OpenBSD: procmap.1,v 1.26 2022/11/10 08:17:53 deraadt Exp $
 .\"	$NetBSD: pmap.1,v 1.6 2003/01/19 21:25:43 atatat Exp $
 .\"
 .\" Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 22 2022 $
+.Dd $Mdocdate: November 10 2022 $
 .Dt PROCMAP 1
 .Os
 .Sh NAME
@@ -82,7 +82,8 @@ information from the process's memory map.
 This output
 mode is an amalgam of the contents of the Solaris, Linux, and
 .Ox
-style output modes.
+style output modes, and attempts to maximize information displayed.
+This is the default output style.
 .It Fl D Ar number
 Enable various debug facilities.
 The
@@ -162,7 +163,6 @@ is optional.
 .It Fl s
 The Solaris style output format, modeled after the Solaris command
 .Dq pmap .
-This is the default output style.
 .It Fl v
 Verbose output.
 When used with
diff --git a/usr.sbin/procmap/procmap.c b/usr.sbin/procmap/procmap.c
index e737990521e..076e6e983e6 100644
--- a/usr.sbin/procmap/procmap.c
+++ b/usr.sbin/procmap/procmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: procmap.c,v 1.70 2022/10/07 15:22:10 deraadt Exp $ */
+/*	$OpenBSD: procmap.c,v 1.71 2022/11/10 08:17:53 deraadt Exp $ */
 /*	$NetBSD: pmap.c,v 1.1 2002/09/01 20:32:44 atatat Exp $ */
 
 /*
@@ -287,7 +287,7 @@ main(int argc, char *argv[])
 	/* apply default */
 	if (print_all + print_map + print_maps + print_solaris +
 	    print_ddb == 0)
-		print_solaris = 1;
+		print_all = 1;
 
 	/* start by opening libkvm */
 	kd = kvm_openfiles(kernel, kmem, NULL, O_RDONLY, errbuf);
-- 
2.20.1