getopt(3) returns -1, not EOF

4 files changed, 11 insertions, 11 deletions

diff --git a/sys/arch/hppa/stand/mkboot/mkboot.c b/sys/arch/hppa/stand/mkboot/mkboot.c
index a68d4a6dd55..789162a3378 100644
--- a/sys/arch/hppa/stand/mkboot/mkboot.c
+++ b/sys/arch/hppa/stand/mkboot/mkboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkboot.c,v 1.6 1999/05/03 22:47:05 mickey Exp $	*/
+/*	$OpenBSD: mkboot.c,v 1.7 1999/05/23 17:19:22 aaron Exp $	*/
 
 /*
  * Copyright (c) 1990, 1993
@@ -43,7 +43,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: mkboot.c,v 1.6 1999/05/03 22:47:05 mickey Exp $";
+static char rcsid[] = "$OpenBSD: mkboot.c,v 1.7 1999/05/23 17:19:22 aaron Exp $";
 #endif /* not lint */
 #endif
 
@@ -110,7 +110,7 @@ main(argc, argv)
 	struct lifvol *lifv = (struct lifvol *)buf;
 	struct lifdir *lifd = (struct lifdir *)(buf + LIF_DIRSTART);
 
-	while ((c = getopt(argc, argv, "vl:")) != EOF) {
+	while ((c = getopt(argc, argv, "vl:")) != -1) {
 		switch (c) {
 		case 'v':
 			verbose++;
diff --git a/sys/arch/i386/isa/pcvt/Util/kbdio/kbdio.y b/sys/arch/i386/isa/pcvt/Util/kbdio/kbdio.y
index 97fed85741d..42007867550 100644
--- a/sys/arch/i386/isa/pcvt/Util/kbdio/kbdio.y
+++ b/sys/arch/i386/isa/pcvt/Util/kbdio/kbdio.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kbdio.y,v 1.2 1999/01/13 07:26:05 niklas Exp $	*/
+/*	$OpenBSD: kbdio.y,v 1.3 1999/05/23 17:19:21 aaron Exp $	*/
 
 /* Hello emacs, this should be edited in -*- Fundamental -*- mode */
 %{
@@ -36,7 +36,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ident "$Header: /cvs/OpenBSD/src/sys/arch/i386/isa/pcvt/Util/kbdio/Attic/kbdio.y,v 1.2 1999/01/13 07:26:05 niklas Exp $"
+#ident "$Header: /cvs/OpenBSD/src/sys/arch/i386/isa/pcvt/Util/kbdio/Attic/kbdio.y,v 1.3 1999/05/23 17:19:21 aaron Exp $"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -307,7 +307,7 @@ int main(int argc, char **argv) {
 	int fd, c;
 	const char *devname = "/dev/console";
 
-	while((c = getopt(argc, argv, "df:")) != EOF)
+	while((c = getopt(argc, argv, "df:")) != -1)
 		switch(c) {
 		case 'd':
 			yydebug = 1;
diff --git a/sys/arch/i386/isa/pcvt/Util/vgaio/vgaio.y b/sys/arch/i386/isa/pcvt/Util/vgaio/vgaio.y
index 6b46cf0efc4..93bfc7e199b 100644
--- a/sys/arch/i386/isa/pcvt/Util/vgaio/vgaio.y
+++ b/sys/arch/i386/isa/pcvt/Util/vgaio/vgaio.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vgaio.y,v 1.2 1999/01/13 07:26:07 niklas Exp $	*/
+/*	$OpenBSD: vgaio.y,v 1.3 1999/05/23 17:19:22 aaron Exp $	*/
 
 /* Hello emacs, this should be edited in -*- Fundamental -*- mode */
 %{
@@ -36,7 +36,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ident "$Header: /cvs/OpenBSD/src/sys/arch/i386/isa/pcvt/Util/vgaio/Attic/vgaio.y,v 1.2 1999/01/13 07:26:07 niklas Exp $"
+#ident "$Header: /cvs/OpenBSD/src/sys/arch/i386/isa/pcvt/Util/vgaio/Attic/vgaio.y,v 1.3 1999/05/23 17:19:22 aaron Exp $"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -229,7 +229,7 @@ int main(int argc, char **argv) {
 	int fd, c;
 	const char *devname = "/dev/console";
 
-	while((c = getopt(argc, argv, "df:")) != EOF)
+	while((c = getopt(argc, argv, "df:")) != -1)
 		switch(c) {
 		case 'd':
 			yydebug = 1;
diff --git a/sys/arch/i386/stand/installboot/installboot.c b/sys/arch/i386/stand/installboot/installboot.c
index f84790ef35a..103f5d000dc 100644
--- a/sys/arch/i386/stand/installboot/installboot.c
+++ b/sys/arch/i386/stand/installboot/installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: installboot.c,v 1.33 1998/12/16 03:04:09 mickey Exp $	*/
+/*	$OpenBSD: installboot.c,v 1.34 1999/05/23 17:19:22 aaron Exp $	*/
 /*	$NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
 
 /*
@@ -111,7 +111,7 @@ main(argc, argv)
 	bios_diskinfo_t di;
 
 	nsectors = nheads = -1;
-	while ((c = getopt(argc, argv, "vnh:s:")) != EOF) {
+	while ((c = getopt(argc, argv, "vnh:s:")) != -1) {
 		switch (c) {
 		case 'h':
 			nheads = atoi(optarg);