diff options
-rw-r--r-- | games/fortune/strfile/strfile.c | 2 | ||||
-rw-r--r-- | gnu/usr.bin/man/man/man.c | 2 | ||||
-rw-r--r-- | gnu/usr.bin/man/manpath/manpath.c | 2 | ||||
-rw-r--r-- | sbin/sconfig/sconfig.c | 2 | ||||
-rw-r--r-- | secure/usr.bin/bdes/bdes.c | 2 | ||||
-rw-r--r-- | tools/regression/fsx/fsx.c | 2 | ||||
-rw-r--r-- | usr.bin/ncplogin/ncplogin.c | 2 | ||||
-rw-r--r-- | usr.sbin/cdcontrol/cdcontrol.c | 2 | ||||
-rw-r--r-- | usr.sbin/zic/zdump.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/games/fortune/strfile/strfile.c b/games/fortune/strfile/strfile.c index 69240d1..790a064 100644 --- a/games/fortune/strfile/strfile.c +++ b/games/fortune/strfile/strfile.c @@ -270,7 +270,7 @@ char **argv; { int ch; - while ((ch = getopt(argc, argv, "Cc:iorsx")) != EOF) + while ((ch = getopt(argc, argv, "Cc:iorsx")) != -1) switch(ch) { case 'C': /* embedded comments */ Cflag++; diff --git a/gnu/usr.bin/man/man/man.c b/gnu/usr.bin/man/man/man.c index 2cdd22a..39b452e 100644 --- a/gnu/usr.bin/man/man/man.c +++ b/gnu/usr.bin/man/man/man.c @@ -324,7 +324,7 @@ man_getopt (argc, argv) extern void downcase (); extern char *manpath (); - while ((c = getopt (argc, argv, args)) != EOF) + while ((c = getopt (argc, argv, args)) != -1) { switch (c) { diff --git a/gnu/usr.bin/man/manpath/manpath.c b/gnu/usr.bin/man/manpath/manpath.c index c1a25de..8c514a4 100644 --- a/gnu/usr.bin/man/manpath/manpath.c +++ b/gnu/usr.bin/man/manpath/manpath.c @@ -78,7 +78,7 @@ main(argc, argv) prognam = mkprogname (argv[0]); - while ((c = getopt (argc, argv, "dhLq?")) != EOF) + while ((c = getopt (argc, argv, "dhLq?")) != -1) { switch (c) { diff --git a/sbin/sconfig/sconfig.c b/sbin/sconfig/sconfig.c index 4274fbf..e34dd7b 100644 --- a/sbin/sconfig/sconfig.c +++ b/sbin/sconfig/sconfig.c @@ -1037,7 +1037,7 @@ main (int argc, char **argv) for (;;) { switch (getopt (argc, argv, "mseftucviax")) { - case EOF: + case -1: break; case 'a': ++aflag; diff --git a/secure/usr.bin/bdes/bdes.c b/secure/usr.bin/bdes/bdes.c index 8e8125a..22df57a 100644 --- a/secure/usr.bin/bdes/bdes.c +++ b/secure/usr.bin/bdes/bdes.c @@ -179,7 +179,7 @@ main(int argc, char *argv[]) /* process the argument list */ kflag = 0; - while ((i = getopt(argc, argv, "abdF:f:k:m:o:pv:")) != EOF) + while ((i = getopt(argc, argv, "abdF:f:k:m:o:pv:")) != -1) switch(i) { case 'a': /* key is ASCII */ keybase = KEY_ASCII; diff --git a/tools/regression/fsx/fsx.c b/tools/regression/fsx/fsx.c index 7da745b..cee7d90 100644 --- a/tools/regression/fsx/fsx.c +++ b/tools/regression/fsx/fsx.c @@ -942,7 +942,7 @@ main(int argc, char **argv) setvbuf(stdout, (char *)0, _IOLBF, 0); /* line buffered stdout */ while ((ch = getopt(argc, argv, "b:c:dl:m:no:p:qr:s:t:w:D:LN:OP:RS:W")) - != EOF) + != -1) switch (ch) { case 'b': simulatedopcount = getnum(optarg, &endp); diff --git a/usr.bin/ncplogin/ncplogin.c b/usr.bin/ncplogin/ncplogin.c index 16e5268..05b95c1 100644 --- a/usr.bin/ncplogin/ncplogin.c +++ b/usr.bin/ncplogin/ncplogin.c @@ -110,7 +110,7 @@ logout(int argc, char *argv[], struct ncp_conn_loginfo *li) { int error = 0, connid, opt; connid = -1; - while ((opt = getopt(argc, argv, STDPARAM_OPT"c:")) != EOF){ + while ((opt = getopt(argc, argv, STDPARAM_OPT"c:")) != -1){ switch (opt) { case 'c': connid = atoi(optarg); diff --git a/usr.sbin/cdcontrol/cdcontrol.c b/usr.sbin/cdcontrol/cdcontrol.c index 040106f..eb914cf 100644 --- a/usr.sbin/cdcontrol/cdcontrol.c +++ b/usr.sbin/cdcontrol/cdcontrol.c @@ -190,7 +190,7 @@ int main (int argc, char **argv) for (;;) { switch (getopt (argc, argv, "svhf:")) { - case EOF: + case -1: break; case 's': verbose = 0; diff --git a/usr.sbin/zic/zdump.c b/usr.sbin/zic/zdump.c index e63e943..980c8a8 100644 --- a/usr.sbin/zic/zdump.c +++ b/usr.sbin/zic/zdump.c @@ -170,7 +170,7 @@ char * argv[]; if (c == 'v') vflag = 1; else cutoff = optarg; - if ((c != EOF && c != -1) || + if ((c != -1) || (optind == argc - 1 && strcmp(argv[optind], "=") == 0)) { usage(); } |