[Midnightbsd-cvs] src [10734] trunk/usr.sbin/jls/jls.c: sync jls with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jun 9 18:02:31 EDT 2018
Revision: 10734
http://svnweb.midnightbsd.org/src/?rev=10734
Author: laffer1
Date: 2018-06-09 18:02:31 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync jls with freebsd
Modified Paths:
--------------
trunk/usr.sbin/jls/Makefile
trunk/usr.sbin/jls/jls.8
trunk/usr.sbin/jls/jls.c
Property Changed:
----------------
trunk/usr.sbin/jls/jls.8
Modified: trunk/usr.sbin/jls/Makefile
===================================================================
--- trunk/usr.sbin/jls/Makefile 2018-06-09 22:02:10 UTC (rev 10733)
+++ trunk/usr.sbin/jls/Makefile 2018-06-09 22:02:31 UTC (rev 10734)
@@ -1,4 +1,5 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/jls/Makefile 222465 2011-05-29 21:03:40Z bz $
.include <bsd.own.mk>
Modified: trunk/usr.sbin/jls/jls.8
===================================================================
--- trunk/usr.sbin/jls/jls.8 2018-06-09 22:02:10 UTC (rev 10733)
+++ trunk/usr.sbin/jls/jls.8 2018-06-09 22:02:31 UTC (rev 10734)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\"
.\" Copyright (c) 2003 Mike Barcroft <mike at FreeBSD.org>
.\" All rights reserved.
@@ -23,9 +24,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.sbin/jls/jls.8 279347 2015-02-27 02:50:01Z jamie $
.\"
-.Dd July 8, 2009
+.Dd July 20, 2012
.Dt JLS 8
.Os
.Sh NAME
@@ -33,7 +34,7 @@
.Nd "list jails"
.Sh SYNOPSIS
.Nm
-.Op Fl dhnqsv
+.Op Fl dhNnqsv
.Op Fl j Ar jail
.Op Ar parameter ...
.Sh DESCRIPTION
@@ -71,6 +72,10 @@
If no parameters are given on the command line,
.Va all
is assumed.
+.It Fl N
+In the standard display mode, print each jail's name instead of its
+numeric ID.
+If the jail does not have a name, the numeric ID is printed instead.
.It Fl n
Print parameters in
.Dq name=value
@@ -88,7 +93,8 @@
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).
Property changes on: trunk/usr.sbin/jls/jls.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/jls/jls.c
===================================================================
--- trunk/usr.sbin/jls/jls.c 2018-06-09 22:02:10 UTC (rev 10733)
+++ trunk/usr.sbin/jls/jls.c 2018-06-09 22:02:31 UTC (rev 10734)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2003 Mike Barcroft <mike at FreeBSD.org>
* Copyright (c) 2008 Bjoern A. Zeeb <bz at FreeBSD.org>
@@ -27,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/jls/jls.c 293290 2016-01-07 00:40:51Z bdrewery $");
#include <sys/param.h>
#include <sys/jail.h>
@@ -55,6 +56,7 @@
#define PRINT_QUOTED 0x08
#define PRINT_SKIP 0x10
#define PRINT_VERBOSE 0x20
+#define PRINT_JAIL_NAME 0x40
static struct jailparam *params;
static int *param_parent;
@@ -77,12 +79,12 @@
int
main(int argc, char **argv)
{
- char *dot, *ep, *jname;
+ char *dot, *ep, *jname, *pname;
int c, i, jflags, jid, lastjid, pflags, spc;
jname = NULL;
pflags = jflags = jid = 0;
- while ((c = getopt(argc, argv, "adj:hnqsv")) >= 0)
+ while ((c = getopt(argc, argv, "adj:hNnqsv")) >= 0)
switch (c) {
case 'a':
case 'd':
@@ -99,6 +101,9 @@
pflags = (pflags & ~(PRINT_SKIP | PRINT_VERBOSE)) |
PRINT_HEADER;
break;
+ case 'N':
+ pflags |= PRINT_JAIL_NAME;
+ break;
case 'n':
pflags = (pflags & ~PRINT_VERBOSE) | PRINT_NAMEVAL;
break;
@@ -115,7 +120,7 @@
PRINT_VERBOSE;
break;
default:
- errx(1, "usage: jls [-dhnqv] [-j jail] [param ...]");
+ errx(1, "usage: jls [-dhNnqv] [-j jail] [param ...]");
}
#ifdef INET6
@@ -149,7 +154,10 @@
#endif
} else {
pflags |= PRINT_DEFAULT;
- add_param("jid", NULL, (size_t)0, NULL, JP_USER);
+ if (pflags & PRINT_JAIL_NAME)
+ add_param("name", NULL, (size_t)0, NULL, JP_USER);
+ else
+ add_param("jid", NULL, (size_t)0, NULL, JP_USER);
#ifdef INET
if (ip4_ok)
add_param("ip4.addr", NULL, (size_t)0, NULL,
@@ -159,10 +167,12 @@
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. */
@@ -169,10 +179,11 @@
for (i = 0; i < nparams; i++) {
if ((params[i].jp_flags & JP_USER) &&
(dot = strchr(params[i].jp_name, '.'))) {
- *dot = 0;
- param_parent[i] = add_param(params[i].jp_name,
+ pname = alloca((dot - params[i].jp_name) + 1);
+ strlcpy(pname, params[i].jp_name,
+ (dot - params[i].jp_name) + 1);
+ param_parent[i] = add_param(pname,
NULL, (size_t)0, NULL, JP_OPT);
- *dot = '.';
}
}
}
@@ -192,8 +203,12 @@
" CPUSetID\n"
" IP Address(es)\n");
else if (pflags & PRINT_DEFAULT)
- printf(" JID IP Address "
- "Hostname Path\n");
+ if (pflags & PRINT_JAIL_NAME)
+ printf(" JID IP Address "
+ "Hostname Path\n");
+ else
+ printf(" JID IP Address "
+ "Hostname Path\n");
else if (pflags & PRINT_HEADER) {
for (i = spc = 0; i < nparams; i++)
if (params[i].jp_flags & JP_USER) {
@@ -206,7 +221,7 @@
putchar('\n');
}
- /* Fetch the jail(s) and print the paramters. */
+ /* Fetch the jail(s) and print the parameters. */
if (jid != 0 || jname != NULL) {
if (print_jail(pflags, jflags) < 0)
errx(1, "%s", jail_errmsg);
@@ -280,10 +295,8 @@
param->jp_flags |= flags;
return param - params;
}
- if (jailparam_init(param, name) < 0)
- errx(1, "%s", jail_errmsg);
- param->jp_flags = flags;
- if ((value != NULL ? jailparam_import_raw(param, value, valuelen)
+ if (jailparam_init(param, name) < 0 ||
+ (value != NULL ? jailparam_import_raw(param, value, valuelen)
: jailparam_import(param, value)) < 0) {
if (flags & JP_OPT) {
nparams--;
@@ -291,6 +304,7 @@
}
errx(1, "%s", jail_errmsg);
}
+ param->jp_flags = flags;
return param - params;
}
@@ -397,9 +411,12 @@
n++;
}
#endif
- } else if (pflags & PRINT_DEFAULT)
- printf("%6d %-15.15s %-29.29s %.74s\n",
- *(int *)params[0].jp_value,
+ } else if (pflags & PRINT_DEFAULT) {
+ if (pflags & PRINT_JAIL_NAME)
+ printf(" %-15s ", (char *)params[0].jp_value);
+ else
+ printf("%6d ", *(int *)params[0].jp_value);
+ printf("%-15.15s %-29.29s %.74s\n",
#ifdef INET
(!ip4_ok || params[1].jp_valuelen == 0) ? "-"
: inet_ntoa(*(struct in_addr *)params[1].jp_value),
@@ -410,7 +427,7 @@
(char *)params[1].jp_value,
(char *)params[2].jp_value);
#endif
- else {
+ } else {
param_values = alloca(nparams * sizeof(*param_values));
for (i = 0; i < nparams; i++) {
if (!(params[i].jp_flags & JP_USER))
More information about the Midnightbsd-cvs
mailing list