svn commit: r320169 - stable/11/usr.bin/procstat

[Brooks Davis]

Author: brooks
Date: Tue Jun 20 20:19:57 2017
New Revision: 320169
URL: https://svnweb.freebsd.org/changeset/base/320169

Log:
  MFC r318968:
  
  Add missing usage and getopt(3) options
  
  - Add the missing option 'n' to the getopt(3) string
  - Add the missing options 'libxo' and 'N' to the usage message
  - Add the missing options 'M' and 'N' to the man-page
  
  Submitted by:	Keegan Drake H.P. <kdrakehp at zoho.com>
  Differential Revision:	https://reviews.freebsd.org/D10915
  Approved by:	re (gjb)

Modified:
  stable/11/usr.bin/procstat/procstat.1
  stable/11/usr.bin/procstat/procstat.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/procstat/procstat.1
==============================================================================
--- stable/11/usr.bin/procstat/procstat.1	Tue Jun 20 19:59:57 2017	(r320168)
+++ stable/11/usr.bin/procstat/procstat.1	Tue Jun 20 20:19:57 2017	(r320169)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 11, 2017
+.Dd June 20, 2017
 .Dt PROCSTAT 1
 .Os
 .Sh NAME
@@ -35,6 +35,8 @@
 .Nm
 .Op Fl -libxo
 .Op Fl CHhn
+.Op Fl M Ar core
+.Op Fl N Ar system
 .Op Fl w Ar interval
 .Op Fl b | c | e | f | i | j | k | l | r | s | S | t | v | x
 .Op Fl a | Ar pid | Ar core ...

Modified: stable/11/usr.bin/procstat/procstat.c
==============================================================================
--- stable/11/usr.bin/procstat/procstat.c	Tue Jun 20 19:59:57 2017	(r320168)
+++ stable/11/usr.bin/procstat/procstat.c	Tue Jun 20 20:19:57 2017	(r320169)
@@ -49,10 +49,11 @@ static void
 usage(void)
 {
 
-	xo_error("usage: procstat [-CHhn] [-M core] [-N system] "
-	    "[-w interval]\n"
+	xo_error("usage: procstat [--libxo] [-CHhn] [-M core] "
+	    "[-N system] [-w interval]\n"
 	    "                [-b | -c | -e | -f | -i | -j | -k | "
-	    "-l | -r | -s | -S | -t | -v | -x]\n"
+	    "-l | -r | -s | \n"
+	    "                 -S | -t | -v | -x]\n"
 	    "                [-a | pid | core ...]\n");
 	xo_finish();
 	exit(EX_USAGE);
@@ -161,7 +162,7 @@ main(int argc, char *argv[])
 	argc = xo_parse_args(argc, argv);
 	xocontainer = "basic";
 
-	while ((ch = getopt(argc, argv, "CHN:M:abcefijklhrsStvw:x")) != -1) {
+	while ((ch = getopt(argc, argv, "abCcefHhijklM:N:nrSstvw:x")) != -1) {
 		switch (ch) {
 		case 'C':
 			Cflag++;