svn commit: r268903 - stable/10/sbin/kldstat

[Baptiste Daroussin]

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, ' ');