svn commit: r279347 - stable/10/usr.sbin/jls

[Jamie Gritton]

Author: jamie
Date: Fri Feb 27 02:50:01 2015
New Revision: 279347
URL: https://svnweb.freebsd.org/changeset/base/279347

Log:
  MFC r279081:
  
    Allow parameters listed on the command line to override the -v option,
    instead of crashing.
  
  PR:		197701

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

Modified: stable/10/usr.sbin/jls/jls.8
==============================================================================
--- stable/10/usr.sbin/jls/jls.8	Fri Feb 27 02:44:12 2015	(r279346)
+++ stable/10/usr.sbin/jls/jls.8	Fri Feb 27 02:50:01 2015	(r279347)
@@ -92,7 +92,8 @@ skipping read-only and unused parameters
 Implies
 .Fl nq .
 .It Fl v
-Print a multiple-line summary per jail, with the following parameters:
+Extend the standard display with a multiple-line summary per jail,
+containing the following parameters:
 jail identifier (jid), hostname (host.hostname), path (path),
 jail name (name), jail state (dying), cpuset ID (cpuset),
 IP address(es) (ip4.addr and ip6.addr).

Modified: stable/10/usr.sbin/jls/jls.c
==============================================================================
--- stable/10/usr.sbin/jls/jls.c	Fri Feb 27 02:44:12 2015	(r279346)
+++ stable/10/usr.sbin/jls/jls.c	Fri Feb 27 02:50:01 2015	(r279347)
@@ -166,10 +166,12 @@ main(int argc, char **argv)
 			    JP_USER);
 			add_param("path", NULL, (size_t)0, NULL, JP_USER);
 		}
-	} else
+	} else {
+		pflags &= ~PRINT_VERBOSE;
 		while (optind < argc)
 			add_param(argv[optind++], NULL, (size_t)0, NULL,
 			    JP_USER);
+	}
 
 	if (pflags & PRINT_SKIP) {
 		/* Check for parameters with jailsys parents. */