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

7 files changed, 20 insertions, 4 deletions

diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog
index d35cd3a1a..0973153ac 100644
--- a/src/lib/kadm/ChangeLog
+++ b/src/lib/kadm/ChangeLog
@@ -1,3 +1,9 @@
+1998-05-06  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* t_ktentry.c (main): 
+	* t_dbentry.c (main): POSIX states that getopt returns -1
+		when it is done parsing options, not EOF.
+
 Wed Feb 18 16:13:15 1998  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
diff --git a/src/lib/kadm/t_dbentry.c b/src/lib/kadm/t_dbentry.c
index 7fa578019..461c8e7ef 100644
--- a/src/lib/kadm/t_dbentry.c
+++ b/src/lib/kadm/t_dbentry.c
@@ -928,7 +928,7 @@ main(argc, argv)
 
     now = time((time_t *) NULL);
     SRAND((RAND_TYPE) now);
-    while ((option = getopt(argc, argv, "r:v")) != EOF) {
+    while ((option = getopt(argc, argv, "r:v")) != -1) {
 	switch (option) {
 	case 'r':
 	    if (sscanf(optarg, "%d", &randompasses) != 1) {
diff --git a/src/lib/kadm/t_ktentry.c b/src/lib/kadm/t_ktentry.c
index 8242699d0..c59319cc6 100644
--- a/src/lib/kadm/t_ktentry.c
+++ b/src/lib/kadm/t_ktentry.c
@@ -366,7 +366,7 @@ main(argc, argv)
 
     now = time((time_t *) NULL);
     SRAND((RAND_TYPE) now);
-    while ((option = getopt(argc, argv, "r:v")) != EOF) {
+    while ((option = getopt(argc, argv, "r:v")) != -1) {
 	switch (option) {
 	case 'r':
 	    if (sscanf(optarg, "%d", &randompasses) != 1) {
diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 6c692d1d1..ec0b38457 100644
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,8 @@
+1998-05-06  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* t_kdb.c (main): POSIX states that getopt returns -1
+		when it is done parsing options, not EOF.
+
 Wed Apr 15 18:06:34 1998  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in (SHLIB_EXPDEPS): 
diff --git a/src/lib/kdb/t_kdb.c b/src/lib/kdb/t_kdb.c
index 75c0a373d..b14152602 100644
--- a/src/lib/kdb/t_kdb.c
+++ b/src/lib/kdb/t_kdb.c
@@ -1015,7 +1015,7 @@ main(argc, argv)
     hash = 0;
 
     /* Parse argument list */
-    while ((option = getopt(argc, argv, "cd:n:prstvDh")) != EOF) {
+    while ((option = getopt(argc, argv, "cd:n:prstvDh")) != -1) {
 	switch (option) {
 	case 'c':
 	    check_cont = 1;
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 12619dd5d..c9b7ece1f 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,8 @@
+1998-05-06  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* t_std_conf.c (main): POSIX states that getopt returns -1
+		when it is done parsing options, not EOF.
+
 Fri Feb 27 18:03:33 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in: Changed thisconfigdir to point at the lib/krb5
diff --git a/src/lib/krb5/os/t_std_conf.c b/src/lib/krb5/os/t_std_conf.c
index 63a4bd727..5e615102e 100644
--- a/src/lib/krb5/os/t_std_conf.c
+++ b/src/lib/krb5/os/t_std_conf.c
@@ -173,7 +173,7 @@ main(argc, argv)
 		exit(1);
 	}
 
-	while ((c = getopt(argc, argv, "dk:r:D:l:s:")) != EOF) {
+	while ((c = getopt(argc, argv, "dk:r:D:l:s:")) != -1) {
 	    switch (c) {
 	    case 'd': /* Get default realm */
 		test_get_default_realm(ctx);