From 441f3c9dace4543ba229039711013ecfc24701a0 Mon Sep 17 00:00:00 2001 From: jkh Date: Sun, 1 Mar 1998 05:10:28 +0000 Subject: Wargh! Who went and changed all the getopt() comparisons from -1 to EOF? The getopt(3) manpage clearly states that the return value is *-1*, not EOF! Besides, getopt(3) isn't reading from a file. :) Noticed-while: merging to 2.2 (where this is correct). --- games/arithmetic/arithmetic.c | 2 +- games/cribbage/crib.c | 2 +- games/factor/factor.c | 2 +- games/fish/fish.c | 2 +- games/morse/morse.c | 2 +- games/number/number.c | 2 +- games/phantasia/setup.c | 2 +- games/piano/piano.c | 4 ++-- games/pig/pig.c | 2 +- games/primes/primes.c | 2 +- games/quiz/quiz.c | 2 +- games/random/random.c | 2 +- games/worms/worms.c | 2 +- games/wump/wump.c | 4 ++-- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/games/arithmetic/arithmetic.c b/games/arithmetic/arithmetic.c index 40261d6..f668ff4 100644 --- a/games/arithmetic/arithmetic.c +++ b/games/arithmetic/arithmetic.c @@ -105,7 +105,7 @@ main(argc, argv) int ch, cnt; void intr(); - while ((ch = getopt(argc, argv, "r:o:")) != EOF) + while ((ch = getopt(argc, argv, "r:o:")) != -1) switch(ch) { case 'o': { register char *p; diff --git a/games/cribbage/crib.c b/games/cribbage/crib.c index 23c53df..22dddba 100644 --- a/games/cribbage/crib.c +++ b/games/cribbage/crib.c @@ -67,7 +67,7 @@ main(argc, argv) /* revoke */ setgid(getgid()); - while ((ch = getopt(argc, argv, "eqr")) != EOF) + while ((ch = getopt(argc, argv, "eqr")) != -1) switch (ch) { case 'e': explain = TRUE; diff --git a/games/factor/factor.c b/games/factor/factor.c index 92f7415..157cecb 100644 --- a/games/factor/factor.c +++ b/games/factor/factor.c @@ -94,7 +94,7 @@ main(argc, argv) int ch; char *p, buf[100]; /* > max number of digits. */ - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch (ch) { case '?': default: diff --git a/games/fish/fish.c b/games/fish/fish.c index 8ca6a32..452808a 100644 --- a/games/fish/fish.c +++ b/games/fish/fish.c @@ -76,7 +76,7 @@ main(argc, argv) { int ch, move; - while ((ch = getopt(argc, argv, "p")) != EOF) + while ((ch = getopt(argc, argv, "p")) != -1) switch(ch) { case 'p': promode = 1; diff --git a/games/morse/morse.c b/games/morse/morse.c index 03118ba..bbba9b2 100644 --- a/games/morse/morse.c +++ b/games/morse/morse.c @@ -213,7 +213,7 @@ main(int argc, char **argv) register int ch; register char *p; - while ((ch = getopt(argc, argv, "spw:f:")) != EOF) + while ((ch = getopt(argc, argv, "spw:f:")) != -1) switch ((char) ch) { case 'f': freq = atoi(optarg); diff --git a/games/number/number.c b/games/number/number.c index 9ab89af..2f5998c 100644 --- a/games/number/number.c +++ b/games/number/number.c @@ -92,7 +92,7 @@ main(argc, argv) char line[256]; lflag = 0; - while ((ch = getopt(argc, argv, "l")) != EOF) + while ((ch = getopt(argc, argv, "l")) != -1) switch (ch) { case 'l': lflag = 1; diff --git a/games/phantasia/setup.c b/games/phantasia/setup.c index 5caac3d..17eea63 100644 --- a/games/phantasia/setup.c +++ b/games/phantasia/setup.c @@ -62,7 +62,7 @@ main(argc, argv) struct stat fbuf; /* for getting files statistics */ int ch; - while ((ch = getopt(argc, argv, "m:")) != EOF) + while ((ch = getopt(argc, argv, "m:")) != -1) switch(ch) { case 'm': monsterfile = optarg; diff --git a/games/piano/piano.c b/games/piano/piano.c index 3c15495..8e16b3a 100644 --- a/games/piano/piano.c +++ b/games/piano/piano.c @@ -1,7 +1,7 @@ /* * piano.c - a piano emulator */ -static char rcsid[] = "$Id$"; +static char rcsid[] = "$Id: piano.c,v 1.4 1997/02/22 14:46:57 peter Exp $"; #include #include #include @@ -139,7 +139,7 @@ main(int argc, char *argv[]) extern int optind, opterr; int ch, ex, show_usage = 0; myname = argv[0]; - while ((ch = getopt(argc, argv, "-vi:")) != EOF) { + while ((ch = getopt(argc, argv, "-vi:")) != -1) { switch (ch) { default: case 'V': diff --git a/games/pig/pig.c b/games/pig/pig.c index b2f9112..fa893bd 100644 --- a/games/pig/pig.c +++ b/games/pig/pig.c @@ -61,7 +61,7 @@ main(argc, argv) int ch; char buf[1024]; - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch(ch) { case '?': default: diff --git a/games/primes/primes.c b/games/primes/primes.c index f174e90..c2e0702 100644 --- a/games/primes/primes.c +++ b/games/primes/primes.c @@ -115,7 +115,7 @@ main(argc, argv) int ch; char *p; - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "")) != -1) switch (ch) { case '?': default: diff --git a/games/quiz/quiz.c b/games/quiz/quiz.c index 637bc25..027ef40 100644 --- a/games/quiz/quiz.c +++ b/games/quiz/quiz.c @@ -85,7 +85,7 @@ main(argc, argv) setgid(getgid()); indexfile = _PATH_QUIZIDX; - while ((ch = getopt(argc, argv, "i:t")) != EOF) + while ((ch = getopt(argc, argv, "i:t")) != -1) switch(ch) { case 'i': indexfile = optarg; diff --git a/games/random/random.c b/games/random/random.c index 076990b..c3ba51c 100644 --- a/games/random/random.c +++ b/games/random/random.c @@ -67,7 +67,7 @@ main(argc, argv) char *ep; random_exit = unbuffer_output = 0; - while ((ch = getopt(argc, argv, "er")) != EOF) + while ((ch = getopt(argc, argv, "er")) != -1) switch (ch) { case 'e': random_exit = 1; diff --git a/games/worms/worms.c b/games/worms/worms.c index 978a02d..0a0371b 100644 --- a/games/worms/worms.c +++ b/games/worms/worms.c @@ -205,7 +205,7 @@ main(argc, argv) number = 3; trail = ' '; field = NULL; - while ((ch = getopt(argc, argv, "fl:n:t")) != EOF) + while ((ch = getopt(argc, argv, "fl:n:t")) != -1) switch(ch) { case 'f': field = "WORM"; diff --git a/games/wump/wump.c b/games/wump/wump.c index 68ae675..1cbf4f2 100644 --- a/games/wump/wump.c +++ b/games/wump/wump.c @@ -116,9 +116,9 @@ main(argc, argv) setgid(getgid()); #ifdef DEBUG - while ((c = getopt(argc, argv, "a:b:hp:r:t:d")) != EOF) + while ((c = getopt(argc, argv, "a:b:hp:r:t:d")) != -1) #else - while ((c = getopt(argc, argv, "a:b:hp:r:t:")) != EOF) + while ((c = getopt(argc, argv, "a:b:hp:r:t:")) != -1) #endif switch (c) { case 'a': -- cgit v1.1