From b790f1b6de154faecbb2f4671b81bb301373fe66 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 23 May 1999 23:24:26 +0000
Subject: [PATCH] getopt(3) returns -1 not EOF.

---
 bin/chio/chio.c                         | 4 ++--
 usr.sbin/i4b/g711conv/g711conv.c        | 4 ++--
 usr.sbin/i4b/isdnd/main.c               | 4 ++--
 usr.sbin/i4b/isdndebug/main.c           | 4 ++--
 usr.sbin/i4b/isdndecode/main.c          | 4 ++--
 usr.sbin/i4b/isdntel/main.c             | 4 ++--
 usr.sbin/i4b/isdntelctl/main.c          | 4 ++--
 usr.sbin/i4b/isdntrace/trace.c          | 4 ++--
 usr.sbin/mptable/mptable.c              | 4 ++--
 usr.sbin/rpc.ypupdated/ypupdated_main.c | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/bin/chio/chio.c b/bin/chio/chio.c
index 180d568352d1..fb82fe63013d 100644
--- a/bin/chio/chio.c
+++ b/bin/chio/chio.c
@@ -496,7 +496,7 @@ do_status(char *cname, int argc, char **argv)
 	description = NULL;
 
 	optind = optreset = 1;
-	while ((c = getopt(argc, argv, "vVsSbaI")) != EOF) {
+	while ((c = getopt(argc, argv, "vVsSbaI")) != -1) {
 		switch (c) {
 		case 'v':
 			pvoltag = 1;
@@ -730,7 +730,7 @@ do_voltag(char *cname, int argc, char **argv)
 	bzero(&csvr, sizeof(csvr));
 
 	optind = optreset = 1;
-	while ((c = getopt(argc, argv, "fca")) != EOF) {
+	while ((c = getopt(argc, argv, "fca")) != -1) {
 		switch (c) {
 		case 'f':
 			force = 1;
diff --git a/usr.sbin/i4b/g711conv/g711conv.c b/usr.sbin/i4b/g711conv/g711conv.c
index a41ba0855480..cc98fc13435b 100644
--- a/usr.sbin/i4b/g711conv/g711conv.c
+++ b/usr.sbin/i4b/g711conv/g711conv.c
@@ -67,7 +67,7 @@
  *
  *	last edit-date: [Mon Apr 26 14:00:31 1999]
  *
- *	$Id: g711conv.c,v 1.3 1999/04/26 12:10:39 hm Exp $
+ *	$Id: g711conv.c,v 1.1 1999/05/20 10:12:14 hm Exp $
  *
  *---------------------------------------------------------------------------*/
 
@@ -185,7 +185,7 @@ main(int argc, char **argv)
 	int opt_R = 0;	
 	unsigned char uc;
 	
-	while ((c = getopt(argc, argv, "aurPR?")) != EOF)
+	while ((c = getopt(argc, argv, "aurPR?")) != -1)
 	{
 		switch(c)
 		{
diff --git a/usr.sbin/i4b/isdnd/main.c b/usr.sbin/i4b/isdnd/main.c
index d43c13f006cb..b4eea98e9bfc 100644
--- a/usr.sbin/i4b/isdnd/main.c
+++ b/usr.sbin/i4b/isdnd/main.c
@@ -27,7 +27,7 @@
  *	i4b daemon - main program entry
  *	-------------------------------
  *
- *	$Id: main.c,v 1.36 1999/04/29 08:27:10 hm Exp $ 
+ *	$Id: main.c,v 1.3 1999/05/20 10:12:42 hm Exp $ 
  *
  *      last edit-date: [Thu Apr 29 09:41:21 1999]
  *
@@ -118,7 +118,7 @@ main(int argc, char **argv)
 #endif
 #endif
 	
-	while ((i = getopt(argc, argv, "bmc:d:fFlL:Pr:s:t:u:?")) != EOF)
+	while ((i = getopt(argc, argv, "bmc:d:fFlL:Pr:s:t:u:?")) != -1)
 	{
 		switch (i)
 		{
diff --git a/usr.sbin/i4b/isdndebug/main.c b/usr.sbin/i4b/isdndebug/main.c
index 7eba58c1cdef..902a74c09c8a 100644
--- a/usr.sbin/i4b/isdndebug/main.c
+++ b/usr.sbin/i4b/isdndebug/main.c
@@ -27,7 +27,7 @@
  *	main.c - i4b set debug options
  *	------------------------------
  *
- *	$Id: main.c,v 1.17 1999/04/28 14:48:06 hm Exp $ 
+ *	$Id: main.c,v 1.3 1999/05/20 10:13:12 hm Exp $ 
  *
  *      last edit-date: [Wed Apr 28 16:47:28 1999]
  *
@@ -84,7 +84,7 @@ main(int argc, char **argv)
 	ctl_debug_t cdbg;
 	int ret;
 	
-	while ((c = getopt(argc, argv, "eghl:mrs:u:zH?")) != EOF)
+	while ((c = getopt(argc, argv, "eghl:mrs:u:zH?")) != -1)
 	{
 		switch(c)
 		{
diff --git a/usr.sbin/i4b/isdndecode/main.c b/usr.sbin/i4b/isdndecode/main.c
index 15e24f4ebd92..eb0fcfea1fef 100644
--- a/usr.sbin/i4b/isdndecode/main.c
+++ b/usr.sbin/i4b/isdndecode/main.c
@@ -27,7 +27,7 @@
  *	main.c - isdndecode main program file
  *	-------------------------------------
  *
- *	$Id: main.c,v 1.8 1999/04/26 12:10:39 hm Exp $
+ *	$Id: main.c,v 1.3 1999/05/20 10:13:30 hm Exp $
  *
  *      last edit-date: [Mon Apr 26 14:02:44 1999]
  *
@@ -90,7 +90,7 @@ main(int argc, char *argv[])
 
 	b = &buf[sizeof(i4b_trace_hdr_t)];
 	
-	while( (c = getopt(argc, argv, "abdf:hiln:op:u:BPR:T:?")) != EOF)
+	while( (c = getopt(argc, argv, "abdf:hiln:op:u:BPR:T:?")) != -1)
 	{
 		switch(c)
 		{
diff --git a/usr.sbin/i4b/isdntel/main.c b/usr.sbin/i4b/isdntel/main.c
index d8bb502c8a46..a93409fed006 100644
--- a/usr.sbin/i4b/isdntel/main.c
+++ b/usr.sbin/i4b/isdntel/main.c
@@ -27,7 +27,7 @@
  *	isdntel - isdn4bsd telephone answering machine support
  *      ======================================================
  *
- *      $Id: main.c,v 1.8 1999/04/26 12:10:39 hm Exp $ 
+ *      $Id: main.c,v 1.3 1999/05/20 10:13:55 hm Exp $ 
  *
  *      last edit-date: [Mon Apr 26 13:56:35 1999]
  *
@@ -61,7 +61,7 @@ main(int argc, char **argv)
 	
 	extern char *optarg;	
 	
-	while ((i = getopt(argc, argv, "a:d:p:t:?")) != EOF)
+	while ((i = getopt(argc, argv, "a:d:p:t:?")) != -1)
 	{
 		switch (i)
 		{
diff --git a/usr.sbin/i4b/isdntelctl/main.c b/usr.sbin/i4b/isdntelctl/main.c
index 52875f61b75d..1a3519e23a95 100644
--- a/usr.sbin/i4b/isdntelctl/main.c
+++ b/usr.sbin/i4b/isdntelctl/main.c
@@ -27,7 +27,7 @@
  *	isdntelctl - i4b set telephone interface options
  *	------------------------------------------------
  *
- *	$Id: main.c,v 1.9 1999/04/26 12:10:39 hm Exp $
+ *	$Id: main.c,v 1.3 1999/05/20 10:14:04 hm Exp $
  *
  *      last edit-date: [Mon Apr 26 14:07:06 1999]
  *
@@ -72,7 +72,7 @@ main(int argc, char **argv)
 	int telfd;
 	char namebuffer[128];
 	
-	while ((c = getopt(argc, argv, "cgu:AUN?")) != EOF)
+	while ((c = getopt(argc, argv, "cgu:AUN?")) != -1)
 	{
 		switch(c)
 		{
diff --git a/usr.sbin/i4b/isdntrace/trace.c b/usr.sbin/i4b/isdntrace/trace.c
index 77a952373d9a..f1346f3274c0 100644
--- a/usr.sbin/i4b/isdntrace/trace.c
+++ b/usr.sbin/i4b/isdntrace/trace.c
@@ -35,7 +35,7 @@
  *	trace.c - print traces of D (B) channel activity for isdn4bsd
  *	-------------------------------------------------------------
  *
- *	$Id: trace.c,v 1.11 1999/02/14 09:44:58 hm Exp $ 
+ *	$Id: trace.c,v 1.3 1999/05/20 10:14:35 hm Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:23:28 1999]
  *
@@ -146,7 +146,7 @@ main(int argc, char *argv[])
 
 	b = &buf[sizeof(i4b_trace_hdr_t)];
 	
-	while( (c = getopt(argc, argv, "abdf:hiln:op:ru:BFPR:T:?")) != EOF)
+	while( (c = getopt(argc, argv, "abdf:hiln:op:ru:BFPR:T:?")) != -1)
 	{
 		switch(c)
 		{
diff --git a/usr.sbin/mptable/mptable.c b/usr.sbin/mptable/mptable.c
index 9c79aa23a5a1..c7c0de8b0e1f 100644
--- a/usr.sbin/mptable/mptable.c
+++ b/usr.sbin/mptable/mptable.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: mptable.c,v 1.9 1997/09/25 06:47:33 charnier Exp $";
+	"$Id: mptable.c,v 1.10 1998/02/24 01:11:47 bde Exp $";
 #endif /* not lint */
 
 #define VMAJOR			2
@@ -321,7 +321,7 @@ main( int argc, char *argv[] )
 
     printf( "MPTable, version %d.%d.%d\n", VMAJOR, VMINOR, VDELTA );
 
-    while ((ch = getopt(argc, argv, "d:g:h:v:")) != EOF) {
+    while ((ch = getopt(argc, argv, "d:g:h:v:")) != -1) {
 	switch(ch) {
 	case 'd':
 	    if ( strcmp( optarg, "mesg") == 0 )
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_main.c b/usr.sbin/rpc.ypupdated/ypupdated_main.c
index 854f6112d199..14f6a45cd52c 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_main.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_main.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: ypupdated_main.c,v 1.2 1997/10/13 11:21:01 charnier Exp $";
 #endif /* not lint */
 
 #include "ypupdate_prot.h"
@@ -197,7 +197,7 @@ main(argc, argv)
 	int asize = sizeof (saddr);
 	int ch;
 
-	while ((ch = getopt(argc, argv, "p:h")) != EOF) {
+	while ((ch = getopt(argc, argv, "p:h")) != -1) {
 		switch(ch) {
 		case 'p':
 			yp_dir = optarg;