From owner-freebsd-bugs  Fri Jun  1 20:45: 7 2001
Delivered-To: freebsd-bugs@freebsd.org
Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75])
	by hub.freebsd.org (Postfix) with ESMTP
	id 1367837B422; Fri,  1 Jun 2001 20:45:04 -0700 (PDT)
	(envelope-from brdavis@odin.ac.hmc.edu)
Received: (from brdavis@localhost)
	by odin.ac.hmc.edu (8.11.0/8.11.0) id f523j3H03643;
	Fri, 1 Jun 2001 20:45:03 -0700
Date: Fri, 1 Jun 2001 20:45:03 -0700
From: Brooks Davis <brooks@one-eyed-alien.net>
To: freebsd-bugs@freebsd.org
Cc: freebsd-gnats-submit@freebsd.org
Subject: Re: bin/21803: [PATCH] wicontrol's -a option mis-documented and not implemented
Message-ID: <20010601204503.A3403@Odin.AC.HMC.Edu>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-bugs.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20freebsd-bugs>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20freebsd-bugs>
X-Loop: FreeBSD.org

Below is an updated version of the patch that applies to a May 30th
current.

-- Brooks

Index: wicontrol.8
===================================================================
RCS file: /home/ncvs/src/usr.sbin/wicontrol/wicontrol.8,v
retrieving revision 1.21
diff -u -r1.21 wicontrol.8
--- wicontrol.8	2001/02/07 13:45:30	1.21
+++ wicontrol.8	2001/06/02 03:42:52
@@ -38,7 +38,7 @@
 .Nd configure WaveLAN/IEEE devices
 .Sh SYNOPSIS
 .Nm
-.Fl i Ar iface Op Fl oa
+.Fl i Ar iface Op Fl o
 .Nm
 .Fl i Ar iface Fl t Ar tx rate
 .Nm
@@ -106,7 +106,7 @@
 .Sh OPTIONS
 The options are as follows:
 .Bl -tag -width Fl
-.It Fl i Ar iface Op Fl oa
+.It Fl i Ar iface Op Fl o
 Display the current settings of the specified WaveLAN/IEEE interface.
 This retrieves the current card settings from the driver and prints them
 out.
@@ -114,12 +114,7 @@
 .Fl o
 flag will cause
 .Nm
-to print out the statistics counters instead of the card settings. Using
-the additional
-.Fl a
-flag will cause
-.Nm
-to print out encryption keys as ascii characters instead of in hex.
+to print out the statistics counters instead of the card settings.
 Encryption keys are only displayed if wicontrol is run as root.
 .It Fl i Ar iface Fl t Ar tx rate
 Set the transmit rate of the specified interface.
Index: wicontrol.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/wicontrol/wicontrol.c,v
retrieving revision 1.16
diff -u -r1.16 wicontrol.c
--- wicontrol.c	2001/01/09 00:50:45	1.16
+++ wicontrol.c	2001/06/02 03:41:28
@@ -715,7 +715,7 @@
 	opterr = 1;
 		
 	while((ch = getopt(argc, argv,
-	    "hoc:d:e:f:i:k:p:r:q:t:n:s:m:v:P:S:T:ZC")) != -1) {
+	    "a:hoc:d:e:f:i:k:p:r:q:t:n:s:m:v:P:S:T:ZC")) != -1) {
 		switch(ch) {
 		case 'Z':
 #ifdef WICACHE
@@ -795,6 +795,10 @@
 			break;
 		case 'P':
 			wi_setword(iface, WI_RID_PM_ENABLED, atoi(optarg));
+			exit(0);
+			break;
+		case 'a':
+			wi_setword(iface, WI_RID_SYSTEM_SCALE, atoi(optarg));
 			exit(0);
 			break;
 		case 'v':

-- 
Any statement of the form "X is the one, true Y" is FALSE.
PGP fingerprint 655D 519C 26A7 82E7 2529  9BF0 5D8E 8BE9 F238 1AD4

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message