From ead24058800353b395a164174cb144e855aa2f00 Mon Sep 17 00:00:00 2001
From: Jared Yanovich <jaredy@cvs.openbsd.org>
Date: Wed, 20 Jul 2005 04:19:09 +0000
Subject: remove the -M and -N flags to uptime, they do nothing. w(1) is
 unaffected by this.

closes PR#4298

ok millert, deraadt
---
 usr.bin/w/w.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'usr.bin/w/w.c')

diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 817a97f62e1..4331b1121e4 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: w.c,v 1.44 2005/04/11 07:04:47 deraadt Exp $	*/
+/*	$OpenBSD: w.c,v 1.45 2005/07/20 04:19:08 jaredy Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)w.c	8.4 (Berkeley) 4/16/94";
 #else
-static char *rcsid = "$OpenBSD: w.c,v 1.44 2005/04/11 07:04:47 deraadt Exp $";
+static char *rcsid = "$OpenBSD: w.c,v 1.45 2005/07/20 04:19:08 jaredy Exp $";
 #endif
 #endif /* not lint */
 
@@ -137,7 +137,7 @@ main(int argc, char *argv[])
 		p = "hiflM:N:asuw";
 	} else if (!strcmp(p, "uptime")) {
 		wcmd = 0;
-		p = "M:N:";
+		p = "";
 	} else
 		errx(1,
 		 "this program should be invoked only as \"w\" or \"uptime\"");
@@ -468,6 +468,6 @@ usage(int wcmd)
 		    "usage: w [-ahi] [-M core] [-N system] [user]\n");
 	else
 		(void)fprintf(stderr,
-		    "usage: uptime [-M core] [-N system]\n");
+		    "usage: uptime\n");
 	exit (1);
 }
-- 
cgit v1.2.3