From 20258f901bb67fd607e413fd85f1421f14628c76 Mon Sep 17 00:00:00 2001
From: bapt <bapt@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sun, 20 Jul 2014 00:34:54 +0000
Subject: [PATCH] MFC: r261032 Add quiet support for kldstat -n
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

PR:		bin/180014
Submitted by:	Olivier Cochard-Labbé <olivier at cochard.me>


git-svn-id: svn://svn.freebsd.org/base/stable/10@268903 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sbin/kldstat/kldstat.8 |  3 ++-
 sbin/kldstat/kldstat.c | 11 ++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sbin/kldstat/kldstat.8 b/sbin/kldstat/kldstat.8
index 6f040e241..bebabe8bf 100644
--- a/sbin/kldstat/kldstat.8
+++ b/sbin/kldstat/kldstat.8
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 23, 2005
+.Dd January 22, 2014
 .Dt KLDSTAT 8
 .Os
 .Sh NAME
@@ -33,6 +33,7 @@
 .Nd display status of dynamic kernel linker
 .Sh SYNOPSIS
 .Nm
+.Op Fl q
 .Op Fl v
 .Op Fl i Ar id
 .Op Fl n Ar filename
diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c
index 575fca808..8785c00ee 100644
--- a/sbin/kldstat/kldstat.c
+++ b/sbin/kldstat/kldstat.c
@@ -78,7 +78,7 @@ printfile(int fileid, int verbose)
 static void
 usage(void)
 {
-    fprintf(stderr, "usage: kldstat [-v] [-i id] [-n filename]\n");
+    fprintf(stderr, "usage: kldstat [-q] [-v] [-i id] [-n filename]\n");
     fprintf(stderr, "       kldstat [-q] [-m modname]\n");
     exit(1);
 }
@@ -146,8 +146,13 @@ main(int argc, char** argv)
     }
 
     if (filename != NULL) {
-	if ((fileid = kldfind(filename)) < 0)
-	    err(1, "can't find file %s", filename);
+	if ((fileid = kldfind(filename)) < 0) {
+	    if (!quiet)
+		warn("can't find file %s", filename);
+	    return 1;
+	} else if (quiet) {
+	    return 0;
+	}
     }
 
     printf("Id Refs Address%*c Size     Name\n", POINTER_WIDTH - 7, ' ');
-- 
2.45.0