getopt(3) returns -1 when out of args, not EOF, whee!

9 files changed, 9 insertions, 9 deletions

diff --git a/sys/arch/i386/isa/pcvt/Util/cursor/cursor.c b/sys/arch/i386/isa/pcvt/Util/cursor/cursor.c
index 82231e4f0ea..2b38cf9b05a 100644
--- a/sys/arch/i386/isa/pcvt/Util/cursor/cursor.c
+++ b/sys/arch/i386/isa/pcvt/Util/cursor/cursor.c
@@ -74,7 +74,7 @@ char *argv[];
 	int dflag = -1;
 	char *device = NULL;
 	
-	while( (c = getopt(argc, argv, "d:n:s:e:")) != EOF)
+	while( (c = getopt(argc, argv, "d:n:s:e:")) != -1)
 	{
 		switch(c)
 		{
diff --git a/sys/arch/i386/isa/pcvt/Util/demo/playvt.c b/sys/arch/i386/isa/pcvt/Util/demo/playvt.c
index d0a391ff6b4..75e1e399260 100644
--- a/sys/arch/i386/isa/pcvt/Util/demo/playvt.c
+++ b/sys/arch/i386/isa/pcvt/Util/demo/playvt.c
@@ -59,7 +59,7 @@ char *argv[];
 	int fflag = -1;
 	char *filename;
 	
-	while( (c = getopt(argc, argv, "d:f:")) != EOF)
+	while( (c = getopt(argc, argv, "d:f:")) != -1)
 	{
 		switch(c)
 		{
diff --git a/sys/arch/i386/isa/pcvt/Util/ispcvt/ispcvt.c b/sys/arch/i386/isa/pcvt/Util/ispcvt/ispcvt.c
index 8520c321d9e..64672ffc9eb 100644
--- a/sys/arch/i386/isa/pcvt/Util/ispcvt/ispcvt.c
+++ b/sys/arch/i386/isa/pcvt/Util/ispcvt/ispcvt.c
@@ -85,7 +85,7 @@ char *argv[];
 	int fd;
 	char *device = NULL;
 
-	while( (c = getopt(argc, argv, "vcd:")) != EOF)
+	while( (c = getopt(argc, argv, "vcd:")) != -1)
 	{
 		switch(c)
 		{
diff --git a/sys/arch/i386/isa/pcvt/Util/kcon/kcon.c b/sys/arch/i386/isa/pcvt/Util/kcon/kcon.c
index ba2b21334ef..4db3d93a4b4 100644
--- a/sys/arch/i386/isa/pcvt/Util/kcon/kcon.c
+++ b/sys/arch/i386/isa/pcvt/Util/kcon/kcon.c
@@ -109,7 +109,7 @@ char *argv[];
 	char *map = NULL;
 	int kbfd;
 	
-	while((c = getopt(argc, argv, "Rd:lm:opr:st:x")) != EOF)
+	while((c = getopt(argc, argv, "Rd:lm:opr:st:x")) != -1)
 	{
 		switch(c)
 		{
diff --git a/sys/arch/i386/isa/pcvt/Util/loadfont/loadfont.c b/sys/arch/i386/isa/pcvt/Util/loadfont/loadfont.c
index 3c10e5c8003..3639e790178 100644
--- a/sys/arch/i386/isa/pcvt/Util/loadfont/loadfont.c
+++ b/sys/arch/i386/isa/pcvt/Util/loadfont/loadfont.c
@@ -95,7 +95,7 @@ main(int argc, char **argv)
 	int dflag = 0;
 	char *device = NULL;
 	
-	while( (c = getopt(argc, argv, "c:d:f:is:")) != EOF)
+	while( (c = getopt(argc, argv, "c:d:f:is:")) != -1)
 	{
 		switch(c)
 		{
diff --git a/sys/arch/i386/isa/pcvt/Util/mcon/mcon.c b/sys/arch/i386/isa/pcvt/Util/mcon/mcon.c
index a4d65060117..f47da8d2eaa 100644
--- a/sys/arch/i386/isa/pcvt/Util/mcon/mcon.c
+++ b/sys/arch/i386/isa/pcvt/Util/mcon/mcon.c
@@ -88,7 +88,7 @@ int main(int argc, char **argv) {
 	int left = 0, mid = 0, right = 0, accel = 0, sticky = -1;
 	struct mousedefs mdef;
 
-	while((c = getopt(argc, argv, "l:m:r:a:s:")) != EOF)
+	while((c = getopt(argc, argv, "l:m:r:a:s:")) != -1)
 		switch(c) {
 		case 'l':
 			left = nametoscan(optarg);
diff --git a/sys/arch/i386/isa/pcvt/Util/scon/scon.c b/sys/arch/i386/isa/pcvt/Util/scon/scon.c
index 53776168b54..edf9ea2fb08 100644
--- a/sys/arch/i386/isa/pcvt/Util/scon/scon.c
+++ b/sys/arch/i386/isa/pcvt/Util/scon/scon.c
@@ -204,7 +204,7 @@ char *argv[];
 	int c;
 	int fd;
 	
-	while( (c = getopt(argc, argv, "ac:d:f:HVlms:t:vp:18")) != EOF)
+	while( (c = getopt(argc, argv, "ac:d:f:HVlms:t:vp:18")) != -1)
 	{
 		switch(c)
 		{
diff --git a/sys/arch/i386/isa/pcvt/Util/set2061/main.c b/sys/arch/i386/isa/pcvt/Util/set2061/main.c
index 03a482d3e3f..a7a020d6e28 100644
--- a/sys/arch/i386/isa/pcvt/Util/set2061/main.c
+++ b/sys/arch/i386/isa/pcvt/Util/set2061/main.c
@@ -63,7 +63,7 @@ char *argv[];
 	long freq = -1;
 	int no = -1;
 	
-	while( (c = getopt(argc, argv, "f:n:")) != EOF)
+	while( (c = getopt(argc, argv, "f:n:")) != -1)
 	{
 		switch(c)
 		{
diff --git a/sys/arch/i386/isa/pcvt/Util/userkeys/vt220keys.c b/sys/arch/i386/isa/pcvt/Util/userkeys/vt220keys.c
index bca5a787ae8..839f83bba4c 100644
--- a/sys/arch/i386/isa/pcvt/Util/userkeys/vt220keys.c
+++ b/sys/arch/i386/isa/pcvt/Util/userkeys/vt220keys.c
@@ -96,7 +96,7 @@ int main(argc,argv)
         if(argc == 1) usage();  /* program requires options              */
 
         /* get options */
-        while ((option = getopt(argc, argv, "cli")) != EOF)
+        while ((option = getopt(argc, argv, "cli")) != -1)
         switch(option) 
         {
                 case 'c' :