POSIX states that getopt returns -1 when it is done parsing options,

not EOF.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10550 dc483132-0cff-0310-8789-dd5450dbe970

8 files changed, 26 insertions, 6 deletions

diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog
index 36513524c..9973d04d6 100644
--- a/src/appl/sample/sserver/ChangeLog
+++ b/src/appl/sample/sserver/ChangeLog
@@ -1,3 +1,8 @@
+1998-05-06  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* sserver.c (main): POSIX states that getopt returns -1 when it
+		is done parsing options, not EOF.
+
 Wed Feb 18 15:33:15 1998  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
diff --git a/src/appl/sample/sserver/sserver.c b/src/appl/sample/sserver/sserver.c
index 78b291d36..e3b08962c 100644
--- a/src/appl/sample/sserver/sserver.c
+++ b/src/appl/sample/sserver/sserver.c
@@ -103,7 +103,7 @@ main(argc, argv)
      *  
      */
     opterr = 0;
-    while ((ch = getopt(argc, argv, "p:S:s:")) != EOF)
+    while ((ch = getopt(argc, argv, "p:S:s:")) != -1)
     switch (ch) {
     case 'p':
 	port = atoi(optarg);
diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog
index 04d4e43f5..3065caa8a 100644
--- a/src/appl/simple/client/ChangeLog
+++ b/src/appl/simple/client/ChangeLog
@@ -1,3 +1,8 @@
+1998-05-06  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* sim_client.c (main): POSIX states that getopt returns -1 when it
+		is done parsing options, not EOF.
+
 Wed Feb 18 15:34:52 1998  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
diff --git a/src/appl/simple/client/sim_client.c b/src/appl/simple/client/sim_client.c
index ec88a76b8..0838757c4 100644
--- a/src/appl/simple/client/sim_client.c
+++ b/src/appl/simple/client/sim_client.c
@@ -108,7 +108,7 @@ main(argc, argv)
      *  
      */
     opterr = 0;
-    while ((ch = getopt(argc, argv, "p:m:h:s:")) != EOF)
+    while ((ch = getopt(argc, argv, "p:m:h:s:")) != -1)
     switch (ch) {
     case 'p':
 	port = atoi(optarg);
diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog
index 3381a5b77..68e9d4bae 100644
--- a/src/appl/simple/server/ChangeLog
+++ b/src/appl/simple/server/ChangeLog
@@ -1,3 +1,8 @@
+1998-05-06  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* sim_server.c (argv): POSIX states that getopt returns -1 when it
+		is done parsing options, not EOF.
+
 Wed Feb 18 15:35:38 1998  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
diff --git a/src/appl/simple/server/sim_server.c b/src/appl/simple/server/sim_server.c
index f57ec8911..7f1a824e4 100644
--- a/src/appl/simple/server/sim_server.c
+++ b/src/appl/simple/server/sim_server.c
@@ -98,7 +98,7 @@ char *argv[];
      *  
      */
     opterr = 0;
-    while ((ch = getopt(argc, argv, "p:s:S:")) != EOF)
+    while ((ch = getopt(argc, argv, "p:s:S:")) != -1)
     switch (ch) {
     case 'p':
 	port = atoi(optarg);
diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index dd3448241..1a50bd4f0 100644
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,3 +1,8 @@
+1998-05-06  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* getopt.c (getopt): POSIX states that getopt returns -1 when it
+		is done parsing options, not EOF.
+
 Wed Feb 18 15:37:20 1998  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
diff --git a/src/appl/telnet/libtelnet/getopt.c b/src/appl/telnet/libtelnet/getopt.c
index a4a735684..d61cc3c1f 100644
--- a/src/appl/telnet/libtelnet/getopt.c
+++ b/src/appl/telnet/libtelnet/getopt.c
@@ -67,12 +67,12 @@ getopt(nargc, nargv, ostr)
 		optreset = 0;
 		if (optind >= nargc || *(place = nargv[optind]) != '-') {
 			place = EMSG;
-			return(EOF);
+			return(-1);
 		}
 		if (place[1] && *++place == '-') {	/* found "--" */
 			++optind;
 			place = EMSG;
-			return(EOF);
+			return(-1);
 		}
 	}					/* option letter okay? */
 	if ((optopt = (int)*place++) == (int)':' ||
@@ -82,7 +82,7 @@ getopt(nargc, nargv, ostr)
 		 * assume it means EOF.
 		 */
 		if (optopt == (int)'-')
-			return(EOF);
+			return(-1);
 		if (!*place)
 			++optind;
 		if (opterr && *ostr != ':') {