Add the -q flag to suppress all output when setting a variable

with -w

ok jsyn@, millert@

2 files changed, 56 insertions, 35 deletions

diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 44376c719d2..f2fbddb9e36 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.8,v 1.98 2003/04/25 20:32:18 grange Exp $
+.\"	$OpenBSD: sysctl.8,v 1.99 2003/05/14 01:50:33 jfb Exp $
 .\"	$NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $
 .\"
 .\" Copyright (c) 1993
@@ -45,7 +45,7 @@
 .Op Fl n
 .Ar name ...
 .Nm sysctl
-.Op Fl n
+.Op Fl nq
 .Fl w
 .Ar name=value ...
 .Nm sysctl
@@ -77,6 +77,10 @@ Example:
       Set the psize shell variable to the pagesize of the hardware
     # set psize=`sysctl -n hw.pagesize`
 .Ed
+.It Fl q
+Suppress all output when setting a variable.
+This option overrides the behaviour of
+.Fl n .
 .It Fl w
 Required to set a variable.
 The MIB name should be followed by an equal sign and the new value.
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index e5491425f7b..8d00f340f9b 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysctl.c,v 1.91 2003/05/06 19:30:14 henning Exp $	*/
+/*	$OpenBSD: sysctl.c,v 1.92 2003/05/14 01:50:33 jfb Exp $	*/
 /*	$NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)sysctl.c	8.5 (Berkeley) 5/9/95";
 #else
-static char *rcsid = "$OpenBSD: sysctl.c,v 1.91 2003/05/06 19:30:14 henning Exp $";
+static char *rcsid = "$OpenBSD: sysctl.c,v 1.92 2003/05/14 01:50:33 jfb Exp $";
 #endif
 #endif /* not lint */
 
@@ -165,7 +165,7 @@ struct list secondlevel[] = {
 	{ 0, 0 },			/* CTL_VFS */
 };
 
-int	Aflag, aflag, nflag, wflag;
+int	Aflag, aflag, nflag, qflag, wflag;
 
 /*
  * Variables requiring special processing.
@@ -220,7 +220,7 @@ main(int argc, char *argv[])
 {
 	int ch, lvl1;
 
-	while ((ch = getopt(argc, argv, "Aanw")) != -1) {
+	while ((ch = getopt(argc, argv, "Aanqw")) != -1) {
 		switch (ch) {
 
 		case 'A':
@@ -235,6 +235,10 @@ main(int argc, char *argv[])
 			nflag = 1;
 			break;
 
+		case 'q':
+			qflag = 1;
+			break;
+
 		case 'w':
 			wflag = 1;
 			break;
@@ -787,10 +791,12 @@ parse(char *string, int flags)
 				(void)printf("%s = ", string);
 			(void)printf("%u\n", *(u_int *)buf);
 		} else {
-			if (!nflag)
-				(void)printf("%s: %u -> ", string,
-				    *(u_int *)buf);
-			(void)printf("%u\n", *(u_int *)newval);
+			if (!qflag) {
+				if (!nflag)
+					(void)printf("%s: %u -> ", string,
+					    *(u_int *)buf);
+				(void)printf("%u\n", *(u_int *)newval);
+			}
 		}
 		return;
 	}
@@ -834,19 +840,10 @@ parse(char *string, int flags)
 		in_port_t port, lastport;
 		u_int32_t *baddynamic = (u_int32_t *)buf;
 
-		if (!nflag)
-			(void)printf("%s%s", string, newsize ? ": " : " = ");
-		lastport = 0;
-		for (port = IPPORT_RESERVED/2; port < IPPORT_RESERVED; port++)
-			if (DP_ISSET(baddynamic, port)) {
-				(void)printf("%s%hd", lastport ? "," : "",
-				    port);
-				lastport = port;
-			}
-		if (newsize != 0) {
+		if (!qflag) {
 			if (!nflag)
-				fputs(" -> ", stdout);
-			baddynamic = (u_int32_t *)newval;
+				(void)printf("%s%s", string,
+				    newsize ? ": " : " = ");
 			lastport = 0;
 			for (port = IPPORT_RESERVED/2; port < IPPORT_RESERVED;
 			    port++)
@@ -855,8 +852,21 @@ parse(char *string, int flags)
 					    lastport ? "," : "", port);
 					lastport = port;
 				}
+			if (newsize != 0) {
+				if (!nflag)
+					fputs(" -> ", stdout);
+				baddynamic = (u_int32_t *)newval;
+				lastport = 0;
+				for (port = IPPORT_RESERVED/2;
+				    port < IPPORT_RESERVED; port++)
+					if (DP_ISSET(baddynamic, port)) {
+						(void)printf("%s%hd",
+						    lastport ? "," : "", port);
+						lastport = port;
+					}
+			}
+			(void)putchar('\n');
 		}
-		(void)putchar('\n');
 		return;
 	}
 	if (special & LONGARRAY) {
@@ -904,10 +914,12 @@ parse(char *string, int flags)
 				(void)printf("%s = ", string);
 			(void)printf("%d\n", *(int *)buf);
 		} else {
-			if (!nflag)
-				(void)printf("%s: %d -> ", string,
-				    *(int *)buf);
-			(void)printf("%d\n", *(int *)newval);
+			if (!qflag) {
+				if (!nflag)
+					(void)printf("%s: %d -> ", string,
+					    *(int *)buf);
+				(void)printf("%d\n", *(int *)newval);
+			}
 		}
 		return;
 
@@ -917,9 +929,11 @@ parse(char *string, int flags)
 				(void)printf("%s = ", string);
 			(void)puts(buf);
 		} else {
-			if (!nflag)
-				(void)printf("%s: %s -> ", string, buf);
-			(void)puts((char *)newval);
+			if (!qflag) {
+				if (!nflag)
+					(void)printf("%s: %s -> ", string, buf);
+				(void)puts((char *)newval);
+			}
 		}
 		return;
 
@@ -933,10 +947,13 @@ parse(char *string, int flags)
 		} else {
 			long long tmp = *(quad_t *)buf;
 
-			if (!nflag)
-				(void)printf("%s: %lld -> ", string, tmp);
-			tmp = *(quad_t *)newval;
-			(void)printf("%qd\n", tmp);
+			if (!qflag) {
+				if (!nflag)
+					(void)printf("%s: %lld -> ",
+					    string, tmp);
+				tmp = *(quad_t *)newval;
+				(void)printf("%qd\n", tmp);
+			}
 		}
 		return;
 
@@ -1974,7 +1991,7 @@ usage(void)
 {
 
 	(void)fprintf(stderr, "usage:\t%s\n\t%s\n\t%s\n\t%s\n",
-	    "sysctl [-n] variable ...", "sysctl [-n] -w variable=value ...",
+	    "sysctl [-n] variable ...", "sysctl [-nq] -w variable=value ...",
 	    "sysctl [-n] -a", "sysctl [-n] -A");
 	exit(1);
 }