diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2008-08-18 12:52:49 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2008-08-18 12:52:49 +0400 |
| commit | 096df1774b9f4def3d04278b3aab51f065039e34 (patch) | |
| tree | aa79050f40f4d351f965d76a6147173c9c941b3d | |
| parent | 01dd3162ff90f8c337257f2a489e8c59decdbcab (diff) | |
* mkgroup.c (main): Keep correctly track of optional arguments.
* mkpasswd.c (main): Ditto.
| -rw-r--r-- | winsup/utils/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/utils/mkgroup.c | 2 | ||||
| -rw-r--r-- | winsup/utils/mkpasswd.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 12ccadaae..d38ec43d7 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,5 +1,10 @@ 2008-08-18 Corinna Vinschen <corinna@vinschen.de> + * mkgroup.c (main): Keep correctly track of optional arguments. + * mkpasswd.c (main): Ditto. + +2008-08-18 Corinna Vinschen <corinna@vinschen.de> + * mkgroup.c (main): Always unset environment variable POSIXLY_CORRECT. Keep track of optional argumnts and fix up optind afterwards. * mkpasswd.c (main): Ditto. diff --git a/winsup/utils/mkgroup.c b/winsup/utils/mkgroup.c index 0b60ccaea..e2d73aa4d 100644 --- a/winsup/utils/mkgroup.c +++ b/winsup/utils/mkgroup.c @@ -786,7 +786,7 @@ main (int argc, char **argv) domlist[print_domlist].domain = (c == 'd' || c == 'D'); opt = optarg ?: argv[optind] && argv[optind][0] != '-' ? argv[optind] : NULL; - if (opt == argv[optind]) + if (argv[optind] && opt == argv[optind]) ++optional_args; for (i = 0; i < print_domlist; ++i) if (domlist[i].domain == domlist[print_domlist].domain diff --git a/winsup/utils/mkpasswd.c b/winsup/utils/mkpasswd.c index d7b999967..70bee353d 100644 --- a/winsup/utils/mkpasswd.c +++ b/winsup/utils/mkpasswd.c @@ -758,7 +758,7 @@ main (int argc, char **argv) domlist[print_domlist].domain = (c == 'd' || c == 'D'); opt = optarg ?: argv[optind] && argv[optind][0] != '-' ? argv[optind] : NULL; - if (opt == argv[optind]) + if (argv[optind] && opt == argv[optind]) ++optional_args; for (i = 0; i < print_domlist; ++i) if (domlist[i].domain == domlist[print_domlist].domain |