* mkgroup.c (main): Keep correctly track of optional arguments.

	* mkpasswd.c (main): Ditto.

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 12ccada..d38ec43 100644 (file)
--- 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 0b60cca..e2d73aa 100644 (file)
--- 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 d7b9999..70bee35 100644 (file)
--- 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