git: f79b200b6aef - main - nfsstat: make -q work without -e/-E

The branch main has been updated by asomers:

URL: https://cgit.FreeBSD.org/src/commit/?id=f79b200b6aefb9bdcbe931c5b7ea604e259beee0

commit f79b200b6aefb9bdcbe931c5b7ea604e259beee0
Author:     Lexi Winter <lexi@le-fay.org>
AuthorDate: 2023-12-28 12:56:57 +0000
Commit:     Alan Somers <asomers@FreeBSD.org>
CommitDate: 2023-12-28 20:27:07 +0000

    nfsstat: make -q work without -e/-E
    
    MFC after:      2 weeks
    Pull Request:   https://github.com/freebsd/freebsd-src/pull/961
---
 usr.bin/nfsstat/nfsstat.1 |  4 ++--
 usr.bin/nfsstat/nfsstat.c | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index 6b062866ce5a..7d641b50f1ac 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd December 27, 2023
+.Dd December 28, 2023
 .Dt NFSSTAT 1
 .Os
 .Sh NAME
@@ -117,7 +117,7 @@ second intervals.
 .It Fl z
 Reset statistics after displaying them.
 .It Fl q
-Do not print header
+Do not print headers.
 .It Fl -libxo
 Generate output via
 .Xr libxo 3
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index 8c4df61b0482..55f5573662c7 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -270,7 +270,8 @@ intpr(int clientOnly, int serverOnly)
 			xo_emit("{T:Client Info:\n");
 
 		xo_open_container("operations");
-		xo_emit("{T:Rpc Counts:}\n");
+		if (printtitle)
+			xo_emit("{T:Rpc Counts:}\n");
 
 		xo_emit("{T:Getattr/%13.13s}{T:Setattr/%13.13s}"
 		    "{T:Lookup/%13.13s}{T:Readlink/%13.13s}"
@@ -321,7 +322,8 @@ intpr(int clientOnly, int serverOnly)
 		xo_close_container("operations");
 
 		xo_open_container("rpcs");
-		xo_emit("{T:Rpc Info:}\n");
+		if (printtitle)
+			xo_emit("{T:Rpc Info:}\n");
 
 		xo_emit("{T:TimedOut/%13.13s}{T:Invalid/%13.13s}"
 		    "{T:X Replies/%13.13s}{T:Retries/%13.13s}"
@@ -337,7 +339,8 @@ intpr(int clientOnly, int serverOnly)
 		xo_close_container("rpcs");
 
 		xo_open_container("cache");
-		xo_emit("{T:Cache Info:}\n");
+		if (printtitle)
+			xo_emit("{T:Cache Info:}\n");
 
 		xo_emit("{T:Attr Hits/%13.13s}{T:Attr Misses/%13.13s}"
 		    "{T:Lkup Hits/%13.13s}{T:Lkup Misses/%13.13s}"
@@ -384,7 +387,8 @@ intpr(int clientOnly, int serverOnly)
 	if (serverOnly) {
 		xo_open_container("serverstats");
 
-		xo_emit("{T:Server Info:}\n");
+		if (printtitle)
+			xo_emit("{T:Server Info:}\n");
 		xo_open_container("operations");
 
 		xo_emit("{T:Getattr/%13.13s}{T:Setattr/%13.13s}"
@@ -437,7 +441,8 @@ intpr(int clientOnly, int serverOnly)
 
 		xo_open_container("server");
 
-		xo_emit("{T:Server Write Gathering:/%13.13s}\n");
+		if (printtitle)
+			xo_emit("{T:Server Write Gathering:/%13.13s}\n");
 
 		xo_emit("{T:WriteOps/%13.13s}{T:WriteRPC/%13.13s}"
 		    "{T:Opsaved/%13.13s}\n");
@@ -453,7 +458,8 @@ intpr(int clientOnly, int serverOnly)
 		xo_close_container("server");
 
 		xo_open_container("cache");
-		xo_emit("{T:Server Cache Stats:/%13.13s}\n");
+		if (printtitle)
+			xo_emit("{T:Server Cache Stats:/%13.13s}\n");
 		xo_emit("{T:Inprog/%13.13s}"
 		    "{T:Non-Idem/%13.13s}{T:Misses/%13.13s}\n");
 		xo_emit("{:inprog/%13ju}{:nonidem/%13ju}{:misses/%13ju}\n",