compare return value from getopt against -1 rather than EOF, per the final

posix standard on the topic.

4 files changed, 10 insertions, 10 deletions

diff --git a/usr.sbin/amd/amd/get_args.c b/usr.sbin/amd/amd/get_args.c
index 874ecd8..b6d14c3 100644
--- a/usr.sbin/amd/amd/get_args.c
+++ b/usr.sbin/amd/amd/get_args.c
@@ -37,7 +37,7 @@
  *
  *	@(#)get_args.c	8.1 (Berkeley) 6/6/93
  *
- * $Id$
+ * $Id: get_args.c,v 1.3 1997/02/22 16:01:28 peter Exp $
  *
  */
 
@@ -113,7 +113,7 @@ char *v[];
 	char *logfile = 0;
 	char *sub_domain = 0;
 
-	while ((opt_ch = getopt(c, v, "mnprva:c:d:h:k:l:t:w:x:y:C:D:")) != EOF)
+	while ((opt_ch = getopt(c, v, "mnprva:c:d:h:k:l:t:w:x:y:C:D:")) != -1)
 	switch (opt_ch) {
 	case 'a':
 		if (*optarg != '/') {
diff --git a/usr.sbin/amd/amq/amq.c b/usr.sbin/amd/amq/amq.c
index a9ac71c..547e1ad 100644
--- a/usr.sbin/amd/amq/amq.c
+++ b/usr.sbin/amd/amq/amq.c
@@ -37,7 +37,7 @@
  *
  *	@(#)amq.c	8.1 (Berkeley) 6/7/93
  *
- * $Id: amq.c,v 1.4 1997/02/22 16:02:07 peter Exp $
+ * $Id: amq.c,v 1.5 1997/03/22 23:12:08 joerg Exp $
  *
  */
 
@@ -54,7 +54,7 @@ char copyright[] = "\
 #endif /* not lint */
 
 #ifndef lint
-static char rcsid[] = "$Id: amq.c,v 1.4 1997/02/22 16:02:07 peter Exp $";
+static char rcsid[] = "$Id: amq.c,v 1.5 1997/03/22 23:12:08 joerg Exp $";
 static char sccsid[] = "@(#)amq.c	8.1 (Berkeley) 6/7/93";
 #endif /* not lint */
 
@@ -310,7 +310,7 @@ char *argv[];
 	/*
 	 * Parse arguments
 	 */
-	while ((opt_ch = getopt(argc, argv, "fh:l:msuvx:D:M:")) != EOF)
+	while ((opt_ch = getopt(argc, argv, "fh:l:msuvx:D:M:")) != -1)
 	switch (opt_ch) {
 	case 'f':
 		flush_flag = 1;
diff --git a/usr.sbin/amd/fsinfo/fsinfo.c b/usr.sbin/amd/fsinfo/fsinfo.c
index cde8bcb..dcc6982 100644
--- a/usr.sbin/amd/fsinfo/fsinfo.c
+++ b/usr.sbin/amd/fsinfo/fsinfo.c
@@ -37,7 +37,7 @@
  *
  *	@(#)fsinfo.c	8.1 (Berkeley) 6/6/93
  *
- * $Id$
+ * $Id: fsinfo.c,v 1.3 1997/02/22 16:03:20 peter Exp $
  *
  */
 
@@ -106,7 +106,7 @@ char *v[];
 	if (!progname)
 		progname = "fsinfo";
 
-	while ((ch = getopt(c, v, "a:b:d:e:f:h:m:D:U:I:qv")) != EOF)
+	while ((ch = getopt(c, v, "a:b:d:e:f:h:m:D:U:I:qv")) != -1)
 	switch (ch) {
 	case 'a':
 		autodir = optarg;
diff --git a/usr.sbin/amd/mk-amd-map/mk-amd-map.c b/usr.sbin/amd/mk-amd-map/mk-amd-map.c
index f35ddd2..a2ba87e 100644
--- a/usr.sbin/amd/mk-amd-map/mk-amd-map.c
+++ b/usr.sbin/amd/mk-amd-map/mk-amd-map.c
@@ -37,7 +37,7 @@
  *
  *	@(#)mk-amd-map.c	8.1 (Berkeley) 6/28/93
  *
- * $Id$
+ * $Id: mk-amd-map.c,v 1.3 1997/02/22 16:03:56 peter Exp $
  */
 
 /*
@@ -53,7 +53,7 @@ char copyright[] = "\
 #endif /* not lint */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$Id: mk-amd-map.c,v 1.3 1997/02/22 16:03:56 peter Exp $";
 static char sccsid[] = "@(#)mk-amd-map.c	8.1 (Berkeley) 6/28/93";
 #endif /* not lint */
 
@@ -249,7 +249,7 @@ char *argv[];
 	int ch;
 	extern int optind;
 
-	while ((ch = getopt(argc, argv, "p")) != EOF)
+	while ((ch = getopt(argc, argv, "p")) != -1)
 	switch (ch) {
 	case 'p':
 		printit = 1;