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

posix standard on the topic.

9 files changed, 9 insertions, 9 deletions

diff --git a/usr.sbin/pcvt/cursor/cursor.c b/usr.sbin/pcvt/cursor/cursor.c
index 94ce1d7..1c7c140 100644
--- a/usr.sbin/pcvt/cursor/cursor.c
+++ b/usr.sbin/pcvt/cursor/cursor.c
@@ -68,7 +68,7 @@ char *argv[];
 	int dflag = -1;
 	char *device;
 
-	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/usr.sbin/pcvt/demo/playvt.c b/usr.sbin/pcvt/demo/playvt.c
index a3ac9fb..b34d798 100644
--- a/usr.sbin/pcvt/demo/playvt.c
+++ b/usr.sbin/pcvt/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/usr.sbin/pcvt/ispcvt/ispcvt.c b/usr.sbin/pcvt/ispcvt/ispcvt.c
index 3e86b90..813e9dd 100644
--- a/usr.sbin/pcvt/ispcvt/ispcvt.c
+++ b/usr.sbin/pcvt/ispcvt/ispcvt.c
@@ -76,7 +76,7 @@ char *argv[];
 	int fd;
 	char *device;
 
-	while( (c = getopt(argc, argv, "vcd:")) != EOF)
+	while( (c = getopt(argc, argv, "vcd:")) != -1)
 	{
 		switch(c)
 		{
diff --git a/usr.sbin/pcvt/kcon/kcon.c b/usr.sbin/pcvt/kcon/kcon.c
index 259af90..1f9cded 100644
--- a/usr.sbin/pcvt/kcon/kcon.c
+++ b/usr.sbin/pcvt/kcon/kcon.c
@@ -95,7 +95,7 @@ char *argv[];
 	char *map;
 	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/usr.sbin/pcvt/loadfont/loadfont.c b/usr.sbin/pcvt/loadfont/loadfont.c
index bbf293f..ce4abc3 100644
--- a/usr.sbin/pcvt/loadfont/loadfont.c
+++ b/usr.sbin/pcvt/loadfont/loadfont.c
@@ -97,7 +97,7 @@ char *argv[];
 	int dflag = 0;
 	char *device;
 
-	while( (c = getopt(argc, argv, "c:d:f:i")) != EOF)
+	while( (c = getopt(argc, argv, "c:d:f:i")) != -1)
 	{
 		switch(c)
 		{
diff --git a/usr.sbin/pcvt/mcon/mcon.c b/usr.sbin/pcvt/mcon/mcon.c
index 1b88dbf..db39944 100644
--- a/usr.sbin/pcvt/mcon/mcon.c
+++ b/usr.sbin/pcvt/mcon/mcon.c
@@ -89,7 +89,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/usr.sbin/pcvt/scon/scon.c b/usr.sbin/pcvt/scon/scon.c
index 0cb053b..d42d5c4 100644
--- a/usr.sbin/pcvt/scon/scon.c
+++ b/usr.sbin/pcvt/scon/scon.c
@@ -196,7 +196,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/usr.sbin/pcvt/set2061/main.c b/usr.sbin/pcvt/set2061/main.c
index e16b1df..49862fa 100644
--- a/usr.sbin/pcvt/set2061/main.c
+++ b/usr.sbin/pcvt/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/usr.sbin/pcvt/userkeys/vt220keys.c b/usr.sbin/pcvt/userkeys/vt220keys.c
index e5a54b5..55664c5 100644
--- a/usr.sbin/pcvt/userkeys/vt220keys.c
+++ b/usr.sbin/pcvt/userkeys/vt220keys.c
@@ -88,7 +88,7 @@ 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' :