From owner-svn-src-head@FreeBSD.ORG Wed Jul 8 15:57:22 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7009106566C; Wed, 8 Jul 2009 15:57:22 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B43918FC15; Wed, 8 Jul 2009 15:57:22 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n68FvMw7055871; Wed, 8 Jul 2009 15:57:22 GMT (envelope-from jamie@svn.freebsd.org) Received: (from jamie@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n68FvMFk055868; Wed, 8 Jul 2009 15:57:22 GMT (envelope-from jamie@svn.freebsd.org) Message-Id: <200907081557.n68FvMFk055868@svn.freebsd.org> From: Jamie Gritton Date: Wed, 8 Jul 2009 15:57:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195462 - head/usr.sbin/jls X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jul 2009 15:57:23 -0000 Author: jamie Date: Wed Jul 8 15:57:22 2009 New Revision: 195462 URL: http://svn.freebsd.org/changeset/base/195462 Log: Give a more expected behavior to -[hns] options, defaulting to all parameters instead of ignoring the options and giving the old-style default output. Approved by: re (kib), bz (mentor) Modified: head/usr.sbin/jls/jls.8 head/usr.sbin/jls/jls.c Modified: head/usr.sbin/jls/jls.8 ============================================================================== --- head/usr.sbin/jls/jls.8 Wed Jul 8 15:46:29 2009 (r195461) +++ head/usr.sbin/jls/jls.8 Wed Jul 8 15:57:22 2009 (r195462) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 27, 2009 +.Dd July 8, 2009 .Dt JLS 8 .Os .Sh NAME @@ -54,6 +54,8 @@ for a description of some core parameter .Pp If no .Ar parameters +or any of the options +.Fl hns are given, the following four columns will be printed: jail identifier (jid), IP address (ip4.addr), hostname (host.hostname), and path (path). @@ -66,17 +68,20 @@ List as well as active jails. .It Fl h Print a header line containing the parameters listed. -If no parameters are given on the command line, the default output always -contains a header. +If no parameters are given on the command line, +.Va all +is assumed. .It Fl n Print parameters in .Dq name=value format, where each parameter is preceded by its name. -This option is ignored for the default four-column output. +If no parameters are given on the command line, +.Va all +is assumed. .It Fl q Put quotes around parameters if they contain spaces or quotes, or are the empty string. -.It Fl c +.It Fl s Print parameters suitable for passing to .Xr jail 8 , skipping read-only and unused parameters. Modified: head/usr.sbin/jls/jls.c ============================================================================== --- head/usr.sbin/jls/jls.c Wed Jul 8 15:46:29 2009 (r195461) +++ head/usr.sbin/jls/jls.c Wed Jul 8 15:57:22 2009 (r195462) @@ -88,7 +88,8 @@ main(int argc, char **argv) jname = optarg; break; case 'h': - pflags = (pflags & ~PRINT_SKIP) | PRINT_HEADER; + pflags = (pflags & ~(PRINT_SKIP | PRINT_VERBOSE)) | + PRINT_HEADER; break; case 'n': pflags = (pflags & ~PRINT_VERBOSE) | PRINT_NAMEVAL; @@ -101,7 +102,8 @@ main(int argc, char **argv) PRINT_NAMEVAL | PRINT_QUOTED | PRINT_SKIP; break; case 'v': - pflags = (pflags & ~(PRINT_NAMEVAL | PRINT_SKIP)) | + pflags = (pflags & + ~(PRINT_HEADER | PRINT_NAMEVAL | PRINT_SKIP)) | PRINT_VERBOSE; break; default: @@ -110,7 +112,9 @@ main(int argc, char **argv) /* Add the parameters to print. */ if (optind == argc) { - if (pflags & PRINT_VERBOSE) { + if (pflags & (PRINT_HEADER | PRINT_NAMEVAL)) + add_param("all", NULL, (size_t)0, NULL, JP_USER); + else if (pflags & PRINT_VERBOSE) { add_param("jid", NULL, (size_t)0, NULL, JP_USER); add_param("host.hostname", NULL, (size_t)0, NULL, JP_USER); @@ -122,9 +126,7 @@ main(int argc, char **argv) add_param("ip6.addr", NULL, (size_t)0, NULL, JP_USER | JP_OPT); } else { - pflags = (pflags & - ~(PRINT_NAMEVAL | PRINT_SKIP | PRINT_VERBOSE)) | - PRINT_DEFAULT; + pflags |= PRINT_DEFAULT; add_param("jid", NULL, (size_t)0, NULL, JP_USER); add_param("ip4.addr", NULL, (size_t)0, NULL, JP_USER); add_param("host.hostname", NULL, (size_t)0, NULL,