diff options
| author |   sobrado <sobrado@openbsd.org> | 2008-03-14 19:19:57 +0000 |
|---|---|---|
| committer | sobrado <sobrado@openbsd.org> | 2008-03-14 19:19:57 +0000 |
| commit | 4aea644a9e6d1dde84b12f11b2d91e72364e85a9 (patch) | |
| tree | 9dabba416c834364bc3b780801919a303062fab3 | |
| parent | synchronize the synopsis and usage; improve description of flag "-a" (diff) | |
| download | wireguard-openbsd-4aea644a9e6d1dde84b12f11b2d91e72364e85a9.tar.xz wireguard-openbsd-4aea644a9e6d1dde84b12f11b2d91e72364e85a9.zip | |
"-Aa" are not required flags; sort synopses; improve description of "-a"
written with invaluable advice from jmc@
ok jmc@
| -rw-r--r-- | sbin/sysctl/sysctl.8 | 11 | ||||
| -rw-r--r-- | sbin/sysctl/sysctl.c | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8 index 65a74a7a712..fb67938fc8f 100644 --- a/sbin/sysctl/sysctl.8 +++ b/sbin/sysctl/sysctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysctl.8,v 1.145 2008/02/11 07:58:28 jmc Exp $ +.\" $OpenBSD: sysctl.8,v 1.146 2008/03/14 19:19:57 sobrado Exp $ .\" $NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $ .\" .\" Copyright (c) 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)sysctl.8 8.2 (Berkeley) 5/9/95 .\" -.Dd $Mdocdate: February 11 2008 $ +.Dd $Mdocdate: March 14 2008 $ .Dt SYSCTL 8 .Os .Sh NAME @@ -38,14 +38,13 @@ .Nd get or set kernel state .Sh SYNOPSIS .Nm sysctl +.Op Fl Aan +.Nm sysctl .Op Fl n .Ar name ... .Nm sysctl .Op Fl nq .Ar name Ns = Ns Ar value ... -.Nm sysctl -.Op Fl n -.Fl Aa .Sh DESCRIPTION The .Nm @@ -75,6 +74,8 @@ Those with string or integer values will be printed as with the flag; for the table values, the name of the utility to retrieve them is given. .It Fl a List all the currently available string or integer values. +This is the default, if no parameters are given to +.Nm . .It Fl n Suppress printing of the field name, only output the field value. Useful for setting shell variables. diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index 66c28433fa0..1897960ce03 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.c,v 1.155 2008/02/09 15:10:58 kettenis Exp $ */ +/* $OpenBSD: sysctl.c,v 1.156 2008/03/14 19:19:57 sobrado Exp $ */ /* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */ /* @@ -40,7 +40,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)sysctl.c 8.5 (Berkeley) 5/9/95"; #else -static const char rcsid[] = "$OpenBSD: sysctl.c,v 1.155 2008/02/09 15:10:58 kettenis Exp $"; +static const char rcsid[] = "$OpenBSD: sysctl.c,v 1.156 2008/03/14 19:19:57 sobrado Exp $"; #endif #endif /* not lint */ @@ -2594,8 +2594,9 @@ void usage(void) { - (void)fprintf(stderr, "usage:\t%s\n\t%s\n\t%s\n", - "sysctl [-n] name ...", "sysctl [-nq] name=value ...", - "sysctl [-Aan]"); + (void)fprintf(stderr, + "usage: sysctl [-Aan]\n" + " sysctl [-n] name ...\n" + " sysctl [-nq] name=value ...\n"); exit(1); } |