From owner-svn-src-head@freebsd.org  Thu Jul 20 05:43:49 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 95B26DA924C;
 Thu, 20 Jul 2017 05:43:49 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 60126816A4;
 Thu, 20 Jul 2017 05:43:49 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6K5hmnT052499;
 Thu, 20 Jul 2017 05:43:48 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6K5hmlD052498;
 Thu, 20 Jul 2017 05:43:48 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201707200543.v6K5hmlD052498@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Thu, 20 Jul 2017 05:43:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r321283 - head/usr.bin/procstat
X-SVN-Group: head
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: head/usr.bin/procstat
X-SVN-Commit-Revision: 321283
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Jul 2017 05:43:49 -0000

Author: ngie
Date: Thu Jul 20 05:43:48 2017
New Revision: 321283
URL: https://svnweb.freebsd.org/changeset/base/321283

Log:
  procstat(8): clarify program usage
  
  - Visualize mutually exclusive options and their corresponding
    arguments.
  - Try to make the subtleties that are expressed in the code, and
    potentially in the manpages, more apparent.

Modified:
  head/usr.bin/procstat/procstat.c

Modified: head/usr.bin/procstat/procstat.c
==============================================================================
--- head/usr.bin/procstat/procstat.c	Thu Jul 20 04:32:06 2017	(r321282)
+++ head/usr.bin/procstat/procstat.c	Thu Jul 20 05:43:48 2017	(r321283)
@@ -50,12 +50,23 @@ static void
 usage(void)
 {
 
-	xo_error("usage: procstat [--libxo] [-CHhn] [-M core] "
+	xo_error(
+	    "usage: procstat [--libxo] [-Hhn] [-M core] "
 	    "[-N system] [-w interval]\n"
-	    "                [-b | -c | -e | -f | -i | -j | -k | "
-	    "-l | -L | -r | -s | \n"
-	    "                 -S | -t | -v | -x]\n"
-	    "                [-a | pid | core ...]\n");
+	    "                [-S | -b | -c | -e | -i | -j | -k | -kk | "
+	    "-l | -r | -s | \n"
+	    "                 -t | -v | -x]\n"
+	    "                [-a | pid ... | core ...]\n"
+	    "       procstat [--libxo] -Cf [-hn] [-M core] "
+	    "[-N system] [-a | pid ... | core ...]\n"
+	    "                [-S | -b | -c | -e | -i | -j | -k | -kk | "
+	    "-l | -r | -s | \n"
+	    "       procstat [--libxo] -L [-hn] [-M core] "
+	    "[-N system] [-w interval]\n"
+	    "                [-S | -b | -c | -e | -i | -j | -k | -kk | "
+	    "-l | -r | -s | \n"
+	    "                 -t | -v | -x]\n"
+	    "                [core ...]\n");
 	xo_finish();
 	exit(EX_USAGE);
 }