diff options
| author | Theodore Tso <tytso@mit.edu> | 1998-05-06 20:24:10 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1998-05-06 20:24:10 +0000 |
| commit | df85cc01656c2a234642047ea22b44b5f6a65683 (patch) | |
| tree | c8eb10be62668ae2cde30336430d8145a3d30df3 /src/kadmin | |
| parent | 376a54c9f64fbb57813e5902bd46ed63e9b2c746 (diff) | |
| download | krb5-df85cc01656c2a234642047ea22b44b5f6a65683.tar.gz krb5-df85cc01656c2a234642047ea22b44b5f6a65683.tar.xz krb5-df85cc01656c2a234642047ea22b44b5f6a65683.zip | |
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
Diffstat (limited to 'src/kadmin')
| -rw-r--r-- | src/kadmin/dbutil/ChangeLog | 7 | ||||
| -rw-r--r-- | src/kadmin/dbutil/kdb5_create.c | 2 | ||||
| -rw-r--r-- | src/kadmin/dbutil/kdb5_destroy.c | 2 | ||||
| -rw-r--r-- | src/kadmin/dbutil/kdb5_stash.c | 2 | ||||
| -rw-r--r-- | src/kadmin/v5passwdd/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin/v5passwdd/kpasswd.c | 2 |
6 files changed, 16 insertions, 4 deletions
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog index 4f89fdd17..3ab92e90e 100644 --- a/src/kadmin/dbutil/ChangeLog +++ b/src/kadmin/dbutil/ChangeLog @@ -1,3 +1,10 @@ +1998-05-06 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * kdb5_stash.c (argv): + * kdb5_destroy.c (kdb5_destroy): + * kdb5_create.c (kdb5_create): POSIX states that getopt returns -1 + when it is done parsing options, not EOF. + Fri Feb 27 23:32:38 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> * Makefile.in: Changed thisconfigdir to point at the kadmin diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c index c599228b4..2e2c5f912 100644 --- a/src/kadmin/dbutil/kdb5_create.c +++ b/src/kadmin/dbutil/kdb5_create.c @@ -138,7 +138,7 @@ void kdb5_create(argc, argv) if (strrchr(argv[0], '/')) argv[0] = strrchr(argv[0], '/')+1; - while ((optchar = getopt(argc, argv, "s")) != EOF) { + while ((optchar = getopt(argc, argv, "s")) != -1) { switch(optchar) { case 's': do_stash++; diff --git a/src/kadmin/dbutil/kdb5_destroy.c b/src/kadmin/dbutil/kdb5_destroy.c index a0567c8b9..c5f47ca2f 100644 --- a/src/kadmin/dbutil/kdb5_destroy.c +++ b/src/kadmin/dbutil/kdb5_destroy.c @@ -63,7 +63,7 @@ kdb5_destroy(argc, argv) dbname = global_params.dbname; optind = 1; - while ((optchar = getopt(argc, argv, "f")) != EOF) { + while ((optchar = getopt(argc, argv, "f")) != -1) { switch(optchar) { case 'f': force++; diff --git a/src/kadmin/dbutil/kdb5_stash.c b/src/kadmin/dbutil/kdb5_stash.c index 9502c0952..40084e2bb 100644 --- a/src/kadmin/dbutil/kdb5_stash.c +++ b/src/kadmin/dbutil/kdb5_stash.c @@ -71,7 +71,7 @@ char *argv[]; keyfile = global_params.stash_file; optind = 1; - while ((optchar = getopt(argc, argv, "f:")) != EOF) { + while ((optchar = getopt(argc, argv, "f:")) != -1) { switch(optchar) { case 'f': keyfile = optarg; diff --git a/src/kadmin/v5passwdd/ChangeLog b/src/kadmin/v5passwdd/ChangeLog index 548e75e87..90a19a8a2 100644 --- a/src/kadmin/v5passwdd/ChangeLog +++ b/src/kadmin/v5passwdd/ChangeLog @@ -1,3 +1,8 @@ +1998-05-06 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * kpasswd.c (main): POSIX states that getopt returns -1 + when it is done parsing options, not EOF. + Fri Feb 27 23:32:38 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> * Makefile.in: Changed thisconfigdir to point at the kadmin diff --git a/src/kadmin/v5passwdd/kpasswd.c b/src/kadmin/v5passwdd/kpasswd.c index 1a7d1c49b..e9785858b 100644 --- a/src/kadmin/v5passwdd/kpasswd.c +++ b/src/kadmin/v5passwdd/kpasswd.c @@ -200,7 +200,7 @@ main(argc, argv) * Usage is: * kpasswd [-u user] [-l language] */ - while ((option = getopt(argc, argv, kpwd_getoptstring)) != EOF) { + while ((option = getopt(argc, argv, kpwd_getoptstring)) != -1) { switch (option) { case 'u': if ((name = (char *) malloc(strlen(optarg)+1)) == NULL) { |