From owner-svn-src-stable@FreeBSD.ORG  Sun Jul 20 00:34:55 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0B3E6A63;
 Sun, 20 Jul 2014 00:34:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EC4D52DFF;
 Sun, 20 Jul 2014 00:34:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6K0YsoJ078296;
 Sun, 20 Jul 2014 00:34:54 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6K0YsO6078294;
 Sun, 20 Jul 2014 00:34:54 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201407200034.s6K0YsO6078294@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 20 Jul 2014 00:34:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r268903 - stable/10/sbin/kldstat
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Jul 2014 00:34:55 -0000

Author: bapt
Date: Sun Jul 20 00:34:54 2014
New Revision: 268903
URL: http://svnweb.freebsd.org/changeset/base/268903

Log:
  MFC: r261032
  Add quiet support for kldstat -n
  
  PR:		bin/180014
  Submitted by:	Olivier Cochard-Labbé <olivier at cochard.me>

Modified:
  stable/10/sbin/kldstat/kldstat.8
  stable/10/sbin/kldstat/kldstat.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/kldstat/kldstat.8
==============================================================================
--- stable/10/sbin/kldstat/kldstat.8	Sun Jul 20 00:32:22 2014	(r268902)
+++ stable/10/sbin/kldstat/kldstat.8	Sun Jul 20 00:34:54 2014	(r268903)
@@ -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

Modified: stable/10/sbin/kldstat/kldstat.c
==============================================================================
--- stable/10/sbin/kldstat/kldstat.c	Sun Jul 20 00:32:22 2014	(r268902)
+++ stable/10/sbin/kldstat/kldstat.c	Sun Jul 20 00:34:54 2014	(r268903)
@@ -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, ' ');