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

not EOF.

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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 3f9dbfdfc1cc0eefdfbd4e5161984ebb66be430d..616a207ed9dbb5926a38739846c42255b6f0d54b 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,10 @@
+1998-05-06  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * login.c (main): 
+       * krshd.c (main): 
+       * krlogind.c (main): POSIX states that getopt returns -1 when it
+               is done parsing options, not EOF.
+
 Sat Feb 28 10:44:46 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * configure.in: Clean up configure script.  Check $cross_compiling

diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index b24fa445eeff51235fc44d6c161a9e542eeb96ed..bd376ff098313a567f736e4e6ef41730ee3030e3 100644 (file)
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -341,7 +341,7 @@ int main(argc, argv)
     
     /* Analyse parameters. */
     opterr = 0;
-    while ((ch = getopt(argc, argv, ARGSTR)) != EOF)
+    while ((ch = getopt(argc, argv, ARGSTR)) != -1)
       switch (ch) {
 #ifdef KERBEROS
        case 'k':

diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c
index 71cadcc7f5a5090c4b83c59c70e261a3ad46dba9..164dd6d55b42b53094b830e8a6eeada8eeac3331 100644 (file)
--- a/src/appl/bsd/krshd.c
+++ b/src/appl/bsd/krshd.c
@@ -281,7 +281,7 @@ int main(argc, argv)
     
     /* Analyze parameters. */
     opterr = 0;
-    while ((ch = getopt(argc, argv, ARGSTR)) != EOF)
+    while ((ch = getopt(argc, argv, ARGSTR)) != -1)
       switch (ch) {
 #ifdef KERBEROS
        case 'k':

diff --git a/src/appl/bsd/login.c b/src/appl/bsd/login.c
index f593c53121ecac0c990adbd752c7426e7ed4ddbc..af9d5ccbc0fa8ca893e67db907d2d2100180a9c7 100644 (file)
--- a/src/appl/bsd/login.c
+++ b/src/appl/bsd/login.c
@@ -1213,7 +1213,7 @@ int rewrite_ccache = 1; /*try to write out ccache*/
 
         fflag = hflag = pflag = rflag = kflag = Kflag = eflag = 0;
        passwd_req = 1;
-       while ((ch = getopt(argc, argv, "Ffeh:pr:k:K:")) != EOF)
+       while ((ch = getopt(argc, argv, "Ffeh:pr:k:K:")) != -1)
                switch (ch) {
                case 'f':
                        EXCL_AUTH_TEST;