* src/chage.c, src/chgpasswd.c, src/chpasswd.c, src/chsh.c,

	src/faillog.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c,
	src/groupmems.c, src/groupmod.c, src/grpconv.c, src/grpunconv.c,
	src/lastlog.c, src/newusers.c, src/passwd.c, src/pwconv.c,
	src/pwunconv.c, src/su.c, src/useradd.c, src/userdel.c,
	src/usermod.c, src/vipw.c: Align and sort options.

diff --git a/ChangeLog b/ChangeLog
index ab59d79c02ed3dd6ef9ec6c64cc395078df248dc..234893c6fafb4e6bd6e97a059473cba6cc8c5407 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-10-31  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * src/chage.c, src/chgpasswd.c, src/chpasswd.c, src/chsh.c,
+       src/faillog.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c,
+       src/groupmems.c, src/groupmod.c, src/grpconv.c, src/grpunconv.c,
+       src/lastlog.c, src/newusers.c, src/passwd.c, src/pwconv.c,
+       src/pwunconv.c, src/su.c, src/useradd.c, src/userdel.c,
+       src/usermod.c, src/vipw.c: Align and sort options.
+
 2011-10-31  Nicolas François  <nicolas.francois@centraliens.net>
 
        * NEWS, src/pwck.c, man/pwck.8.xm, src/grpck.c, man/grpck.8.xml:

diff --git a/src/chage.c b/src/chage.c
index 40e465f429c844c0667a744201903cb90d43fe79..4702783520d45b3a076605b35c56f4881ae44c98 100644 (file)
--- a/src/chage.c
+++ b/src/chage.c
@@ -386,15 +386,15 @@ static void process_flags (int argc, char **argv)
         */
        int c;
        static struct option long_options[] = {
-               {"lastday", required_argument, NULL, 'd'},
+               {"lastday",    required_argument, NULL, 'd'},
                {"expiredate", required_argument, NULL, 'E'},
-               {"help", no_argument, NULL, 'h'},
-               {"inactive", required_argument, NULL, 'I'},
-               {"list", no_argument, NULL, 'l'},
-               {"mindays", required_argument, NULL, 'm'},
-               {"maxdays", required_argument, NULL, 'M'},
-               {"root", required_argument, NULL, 'R'},
-               {"warndays", required_argument, NULL, 'W'},
+               {"help",       no_argument,       NULL, 'h'},
+               {"inactive",   required_argument, NULL, 'I'},
+               {"list",       no_argument,       NULL, 'l'},
+               {"mindays",    required_argument, NULL, 'm'},
+               {"maxdays",    required_argument, NULL, 'M'},
+               {"root",       required_argument, NULL, 'R'},
+               {"warndays",   required_argument, NULL, 'W'},
                {NULL, 0, NULL, '\0'}
        };
 

diff --git a/src/chgpasswd.c b/src/chgpasswd.c
index 5c4ded6bef13192a70b295a2787d3042622e4dcf..af53338732bf5630b33371cba4961cfa2dcef8f5 100644 (file)
--- a/src/chgpasswd.c
+++ b/src/chgpasswd.c
@@ -156,12 +156,12 @@ static void process_flags (int argc, char **argv)
        int c;
        static struct option long_options[] = {
                {"crypt-method", required_argument, NULL, 'c'},
-               {"encrypted", no_argument, NULL, 'e'},
-               {"help", no_argument, NULL, 'h'},
-               {"md5", no_argument, NULL, 'm'},
-               {"root", required_argument, NULL, 'R'},
+               {"encrypted",    no_argument,       NULL, 'e'},
+               {"help",         no_argument,       NULL, 'h'},
+               {"md5",          no_argument,       NULL, 'm'},
+               {"root",         required_argument, NULL, 'R'},
 #ifdef USE_SHA_CRYPT
-               {"sha-rounds", required_argument, NULL, 's'},
+               {"sha-rounds",   required_argument, NULL, 's'},
 #endif
                {NULL, 0, NULL, '\0'}
        };

diff --git a/src/chpasswd.c b/src/chpasswd.c
index f945f5df4d95250bb343feebbe6fa54aafaf348d..ef54a486c7f3eeec67893993e371271ad63f1b1b 100644 (file)
--- a/src/chpasswd.c
+++ b/src/chpasswd.c
@@ -149,13 +149,13 @@ static void process_flags (int argc, char **argv)
        int c;
        static struct option long_options[] = {
                {"crypt-method", required_argument, NULL, 'c'},
-               {"encrypted", no_argument, NULL, 'e'},
-               {"md5", no_argument, NULL, 'm'},
-               {"root", required_argument, NULL, 'R'},
+               {"encrypted",    no_argument,       NULL, 'e'},
+               {"help",         no_argument,       NULL, 'h'},
+               {"md5",          no_argument,       NULL, 'm'},
+               {"root",         required_argument, NULL, 'R'},
 #ifdef USE_SHA_CRYPT
-               {"sha-rounds", required_argument, NULL, 's'},
+               {"sha-rounds",   required_argument, NULL, 's'},
 #endif                         /* USE_SHA_CRYPT */
-               {"help", no_argument, NULL, 'h'},
                {NULL, 0, NULL, '\0'}
        };
 
@@ -167,15 +167,15 @@ static void process_flags (int argc, char **argv)
 #endif                         /* !USE_SHA_CRYPT */
                                 long_options, NULL)) != -1) {
                switch (c) {
-               case 'h':
-                       usage (E_SUCCESS);
-                       /*@notreached@*/break;
                case 'c':
                        crypt_method = optarg;
                        break;
                case 'e':
                        eflg = true;
                        break;
+               case 'h':
+                       usage (E_SUCCESS);
+                       /*@notreached@*/break;
                case 'm':
                        md5flg = true;
                        break;

diff --git a/src/chsh.c b/src/chsh.c
index 132ba17be7e506db937c6b79b453993981de1b14..c038f69743adbcdd67f63874bdabee380d03a388 100644 (file)
--- a/src/chsh.c
+++ b/src/chsh.c
@@ -206,8 +206,8 @@ static void process_flags (int argc, char **argv)
 {
        int c;
        static struct option long_options[] = {
-               {"help", no_argument, NULL, 'h'},
-               {"root", required_argument, NULL, 'R'},
+               {"help",  no_argument,       NULL, 'h'},
+               {"root",  required_argument, NULL, 'R'},
                {"shell", required_argument, NULL, 's'},
                {NULL, 0, NULL, '\0'}
        };

diff --git a/src/faillog.c b/src/faillog.c
index 5fdd485d5d730e49da6f653c3d630381a373db3e..632e638eef63f478c10176259662cfd1498aa2e3 100644 (file)
--- a/src/faillog.c
+++ b/src/faillog.c
@@ -579,14 +579,14 @@ int main (int argc, char **argv)
        {
                int c;
                static struct option long_options[] = {
-                       {"all", no_argument, NULL, 'a'},
-                       {"help", no_argument, NULL, 'h'},
+                       {"all",       no_argument,       NULL, 'a'},
+                       {"help",      no_argument,       NULL, 'h'},
                        {"lock-secs", required_argument, NULL, 'l'},
-                       {"maximum", required_argument, NULL, 'm'},
-                       {"reset", no_argument, NULL, 'r'},
-                       {"root", required_argument, NULL, 'R'},
-                       {"time", required_argument, NULL, 't'},
-                       {"user", required_argument, NULL, 'u'},
+                       {"maximum",   required_argument, NULL, 'm'},
+                       {"reset",     no_argument,       NULL, 'r'},
+                       {"root",      required_argument, NULL, 'R'},
+                       {"time",      required_argument, NULL, 't'},
+                       {"user",      required_argument, NULL, 'u'},
                        {NULL, 0, NULL, '\0'}
                };
                while ((c = getopt_long (argc, argv, "ahl:m:rR:t:u:",

diff --git a/src/gpasswd.c b/src/gpasswd.c
index 7dd3fae77cf81b8411100ca7ab1595ab74a828a7..1b830346e958f309f48ef98a096ba6a54f85019f 100644 (file)
--- a/src/gpasswd.c
+++ b/src/gpasswd.c
@@ -229,14 +229,14 @@ static void process_flags (int argc, char **argv)
 {
        int c;
        static struct option long_options[] = {
-               {"add", required_argument, NULL, 'a'},
-               {"delete", required_argument, NULL, 'd'},
-               {"help", no_argument, NULL, 'h'},
-               {"remove-password", no_argument, NULL, 'r'},
-               {"restrict", no_argument, NULL, 'R'},
-               {"administrators", required_argument, NULL, 'A'},
-               {"members", required_argument, NULL, 'M'},
-               {"root", required_argument, NULL, 'Q'},
+               {"add",             required_argument, NULL, 'a'},
+               {"administrators",  required_argument, NULL, 'A'},
+               {"delete",          required_argument, NULL, 'd'},
+               {"help",            no_argument,       NULL, 'h'},
+               {"members",         required_argument, NULL, 'M'},
+               {"root",            required_argument, NULL, 'Q'},
+               {"remove-password", no_argument,       NULL, 'r'},
+               {"restrict",        no_argument,       NULL, 'R'},
                {NULL, 0, NULL, '\0'}
                };
 

diff --git a/src/groupadd.c b/src/groupadd.c
index eb1c4e16bb4e7c217d9445307a527185bf9a657b..b4c057cd8471fa14f9dacb626080df2a43fc80a0 100644 (file)
--- a/src/groupadd.c
+++ b/src/groupadd.c
@@ -378,14 +378,14 @@ static void process_flags (int argc, char **argv)
        char *cp;
        int c;
        static struct option long_options[] = {
-               {"force", no_argument, NULL, 'f'},
-               {"gid", required_argument, NULL, 'g'},
-               {"help", no_argument, NULL, 'h'},
-               {"key", required_argument, NULL, 'K'},
-               {"non-unique", no_argument, NULL, 'o'},
-               {"password", required_argument, NULL, 'p'},
-               {"system", no_argument, NULL, 'r'},
-               {"root", required_argument, NULL, 'R'},
+               {"force",      no_argument,       NULL, 'f'},
+               {"gid",        required_argument, NULL, 'g'},
+               {"help",       no_argument,       NULL, 'h'},
+               {"key",        required_argument, NULL, 'K'},
+               {"non-unique", no_argument,       NULL, 'o'},
+               {"password",   required_argument, NULL, 'p'},
+               {"system",     no_argument,       NULL, 'r'},
+               {"root",       required_argument, NULL, 'R'},
                {NULL, 0, NULL, '\0'}
        };
 

diff --git a/src/groupdel.c b/src/groupdel.c
index 1a7de7097461e916cb5a6faaa109a66cde441d10..9bf5863f39ac253f33e8633f9245aafa989abe1c 100644 (file)
--- a/src/groupdel.c
+++ b/src/groupdel.c
@@ -316,7 +316,7 @@ static void process_flags (int argc, char **argv)
         */
        int c;
        static struct option long_options[] = {
-               {"help", no_argument, NULL, 'h'},
+               {"help", no_argument,       NULL, 'h'},
                {"root", required_argument, NULL, 'R'},
                {NULL, 0, NULL, '\0'}
        };

diff --git a/src/groupmems.c b/src/groupmems.c
index 0643d707c468b0a3caa8ceaa88bc71f981bcf89e..e1f77b7eb980e1b8ebd32df5d15253be21b5d739 100644 (file)
--- a/src/groupmems.c
+++ b/src/groupmems.c
@@ -389,13 +389,13 @@ static void process_flags (int argc, char **argv)
 {
        int c;
        static struct option long_options[] = {
-               {"add", required_argument, NULL, 'a'},
+               {"add",    required_argument, NULL, 'a'},
                {"delete", required_argument, NULL, 'd'},
-               {"group", required_argument, NULL, 'g'},
-               {"help", no_argument, NULL, 'h'},
-               {"list", no_argument, NULL, 'l'},
-               {"purge", no_argument, NULL, 'p'},
-               {"root", required_argument, NULL, 'R'},
+               {"group",  required_argument, NULL, 'g'},
+               {"help",   no_argument,       NULL, 'h'},
+               {"list",   no_argument,       NULL, 'l'},
+               {"purge",  no_argument,       NULL, 'p'},
+               {"root",   required_argument, NULL, 'R'},
                {NULL, 0, NULL, '\0'}
        };
 

diff --git a/src/groupmod.c b/src/groupmod.c
index 5b139df5f0a629437404efb8a99c307ae72178a9..96de082a705b64cda347c19b6d583c8ca9b8560f 100644 (file)
--- a/src/groupmod.c
+++ b/src/groupmod.c
@@ -370,12 +370,12 @@ static void process_flags (int argc, char **argv)
 {
        int c;
        static struct option long_options[] = {
-               {"gid", required_argument, NULL, 'g'},
-               {"help", no_argument, NULL, 'h'},
-               {"new-name", required_argument, NULL, 'n'},
-               {"non-unique", no_argument, NULL, 'o'},
-               {"password", required_argument, NULL, 'p'},
-               {"root", required_argument, NULL, 'R'},
+               {"gid",        required_argument, NULL, 'g'},
+               {"help",       no_argument,       NULL, 'h'},
+               {"new-name",   required_argument, NULL, 'n'},
+               {"non-unique", no_argument,       NULL, 'o'},
+               {"password",   required_argument, NULL, 'p'},
+               {"root",       required_argument, NULL, 'R'},
                {NULL, 0, NULL, '\0'}
        };
        while ((c = getopt_long (argc, argv, "g:hn:op:R:",

diff --git a/src/grpconv.c b/src/grpconv.c
index 5f839c95ea5f746b8495cebf6703ffba431a0db2..4568bc14077a29933f7461ecf492bcdf69bca6d3 100644 (file)
--- a/src/grpconv.c
+++ b/src/grpconv.c
@@ -114,7 +114,7 @@ static void process_flags (int argc, char **argv)
         */
        int c;
        static struct option long_options[] = {
-               {"help", no_argument, NULL, 'h'},
+               {"help", no_argument,       NULL, 'h'},
                {"root", required_argument, NULL, 'R'},
                {NULL, 0, NULL, '\0'}
        };

diff --git a/src/grpunconv.c b/src/grpunconv.c
index 0c2ef4c39e8c1c1f3b6d272d48567a5406ebbbba..89fb97b2cebdb964ee6fdd86ded35a8f96baea5e 100644 (file)
--- a/src/grpunconv.c
+++ b/src/grpunconv.c
@@ -114,7 +114,7 @@ static void process_flags (int argc, char **argv)
         */
        int c;
        static struct option long_options[] = {
-               {"help", no_argument, NULL, 'h'},
+               {"help", no_argument,       NULL, 'h'},
                {"root", required_argument, NULL, 'R'},
                {NULL, 0, NULL, '\0'}
        };

diff --git a/src/lastlog.c b/src/lastlog.c
index 091d86009bb6086038c6d11382fd63e2763c966f..ed9484aafd8cbd62f2ce6a032a2c835109ae5726 100644 (file)
--- a/src/lastlog.c
+++ b/src/lastlog.c
@@ -211,48 +211,48 @@ int main (int argc, char **argv)
        {
                int c;
                static struct option const longopts[] = {
-                       {"help", no_argument, NULL, 'h'},
-                       {"time", required_argument, NULL, 't'},
                        {"before", required_argument, NULL, 'b'},
-                       {"root", required_argument, NULL, 'R'},
-                       {"user", required_argument, NULL, 'u'},
+                       {"help",   no_argument,       NULL, 'h'},
+                       {"root",   required_argument, NULL, 'R'},
+                       {"time",   required_argument, NULL, 't'},
+                       {"user",   required_argument, NULL, 'u'},
                        {NULL, 0, NULL, '\0'}
                };
 
-               while ((c = getopt_long (argc, argv, "ht:b:R:u:", longopts,
+               while ((c = getopt_long (argc, argv, "b:hR:t:u:", longopts,
                                         NULL)) != -1) {
                        switch (c) {
-                       case 'h':
-                               usage (EXIT_SUCCESS);
-                               /*@notreached@*/break;
-                       case 't':
+                       case 'b':
                        {
-                               unsigned long days;
-                               if (getulong (optarg, &days) == 0) {
+                               unsigned long inverse_days;
+                               if (getulong (optarg, &inverse_days) == 0) {
                                        fprintf (stderr,
                                                 _("%s: invalid numeric argument '%s'\n"),
                                                 Prog, optarg);
                                        exit (EXIT_FAILURE);
                                }
-                               seconds = (time_t) days * DAY;
-                               tflg = true;
+                               inverse_seconds = (time_t) inverse_days * DAY;
+                               bflg = true;
                                break;
                        }
-                       case 'b':
+                       case 'h':
+                               usage (EXIT_SUCCESS);
+                               /*@notreached@*/break;
+                       case 'R': /* no-op, handled in process_root_flag () */
+                               break;
+                       case 't':
                        {
-                               unsigned long inverse_days;
-                               if (getulong (optarg, &inverse_days) == 0) {
+                               unsigned long days;
+                               if (getulong (optarg, &days) == 0) {
                                        fprintf (stderr,
                                                 _("%s: invalid numeric argument '%s'\n"),
                                                 Prog, optarg);
                                        exit (EXIT_FAILURE);
                                }
-                               inverse_seconds = (time_t) inverse_days * DAY;
-                               bflg = true;
+                               seconds = (time_t) days * DAY;
+                               tflg = true;
                                break;
                        }
-                       case 'R': /* no-op, handled in process_root_flag () */
-                               break;
                        case 'u':
                        {
                                const struct passwd *pwent;

diff --git a/src/newusers.c b/src/newusers.c
index e0bfa226cb94c141a4ffc5c2c876568a210a0c7f..1f9e357015d8e26c3cfaf9d88906f4c2872b423d 100644 (file)
--- a/src/newusers.c
+++ b/src/newusers.c
@@ -527,12 +527,14 @@ static void process_flags (int argc, char **argv)
        static struct option long_options[] = {
 #ifndef USE_PAM
                {"crypt-method", required_argument, NULL, 'c'},
+#endif                         /* !USE_PAM */
+               {"help",         no_argument,       NULL, 'h'},
+               {"system",       no_argument,       NULL, 'r'},
+#ifndef USE_PAM
 #ifdef USE_SHA_CRYPT
-               {"sha-rounds", required_argument, NULL, 's'},
+               {"sha-rounds",   required_argument, NULL, 's'},
 #endif                         /* USE_SHA_CRYPT */
 #endif                         /* !USE_PAM */
-               {"help", no_argument, NULL, 'h'},
-               {"system", no_argument, NULL, 'r'},
                {NULL, 0, NULL, '\0'}
        };
 
@@ -548,6 +550,11 @@ static void process_flags (int argc, char **argv)
 #endif
                                 long_options, NULL)) != -1) {
                switch (c) {
+#ifndef USE_PAM
+               case 'c':
+                       crypt_method = optarg;
+                       break;
+#endif                         /* !USE_PAM */
                case 'h':
                        usage (EXIT_SUCCESS);
                        break;
@@ -555,9 +562,6 @@ static void process_flags (int argc, char **argv)
                        rflg = true;
                        break;
 #ifndef USE_PAM
-               case 'c':
-                       crypt_method = optarg;
-                       break;
 #ifdef USE_SHA_CRYPT
                case 's':
                        sflg = true;

diff --git a/src/passwd.c b/src/passwd.c
index 0e5ccf8022983bab0b28ea52e780f1877bf4ef92..e62d3fd9a300c8d6bb53c05387bc07685af06d22 100644 (file)
--- a/src/passwd.c
+++ b/src/passwd.c
@@ -802,21 +802,21 @@ int main (int argc, char **argv)
                 */
                int c;
                static struct option long_options[] = {
-                       {"all", no_argument, NULL, 'a'},
-                       {"delete", no_argument, NULL, 'd'},
-                       {"expire", no_argument, NULL, 'e'},
-                       {"help", no_argument, NULL, 'h'},
-                       {"inactive", required_argument, NULL, 'i'},
-                       {"keep-tokens", no_argument, NULL, 'k'},
-                       {"lock", no_argument, NULL, 'l'},
-                       {"mindays", required_argument, NULL, 'n'},
-                       {"quiet", no_argument, NULL, 'q'},
-                       {"repository", required_argument, NULL, 'r'},
-                       {"root", required_argument, NULL, 'R'},
-                       {"status", no_argument, NULL, 'S'},
-                       {"unlock", no_argument, NULL, 'u'},
-                       {"warndays", required_argument, NULL, 'w'},
-                       {"maxdays", required_argument, NULL, 'x'},
+                       {"all",         no_argument,       NULL, 'a'},
+                       {"delete",      no_argument,       NULL, 'd'},
+                       {"expire",      no_argument,       NULL, 'e'},
+                       {"help",        no_argument,       NULL, 'h'},
+                       {"inactive",    required_argument, NULL, 'i'},
+                       {"keep-tokens", no_argument,       NULL, 'k'},
+                       {"lock",        no_argument,       NULL, 'l'},
+                       {"mindays",     required_argument, NULL, 'n'},
+                       {"quiet",       no_argument,       NULL, 'q'},
+                       {"repository",  required_argument, NULL, 'r'},
+                       {"root",        required_argument, NULL, 'R'},
+                       {"status",      no_argument,       NULL, 'S'},
+                       {"unlock",      no_argument,       NULL, 'u'},
+                       {"warndays",    required_argument, NULL, 'w'},
+                       {"maxdays",     required_argument, NULL, 'x'},
                        {NULL, 0, NULL, '\0'}
                };
 
@@ -834,6 +834,9 @@ int main (int argc, char **argv)
                                eflg = true;
                                anyflag = true;
                                break;
+                       case 'h':
+                               usage (E_SUCCESS);
+                               /*@notreached@*/break;
                        case 'i':
                                if (   (getlong (optarg, &inact) == 0)
                                    || (inact < -1)) {
@@ -908,9 +911,6 @@ int main (int argc, char **argv)
                                xflg = true;
                                anyflag = true;
                                break;
-                       case 'h':
-                               usage (E_SUCCESS);
-                               /*@notreached@*/break;
                        default:
                                usage (E_BAD_ARG);
                        }

diff --git a/src/pwconv.c b/src/pwconv.c
index 082095c6ed314cc95e4f3e71b6de39f6beb54908..cb4ae4f7e849953a9334b30362f5b808be12eff9 100644 (file)
--- a/src/pwconv.c
+++ b/src/pwconv.c
@@ -144,7 +144,7 @@ static void process_flags (int argc, char **argv)
         */
        int c;
        static struct option long_options[] = {
-               {"help", no_argument, NULL, 'h'},
+               {"help", no_argument,       NULL, 'h'},
                {"root", required_argument, NULL, 'R'},
                {NULL, 0, NULL, '\0'}
        };

diff --git a/src/pwunconv.c b/src/pwunconv.c
index c108fe56ebe3879ce7f705a29b03e7340522a488..9b74614c47dddeb4010b464a6eabf41081656d61 100644 (file)
--- a/src/pwunconv.c
+++ b/src/pwunconv.c
@@ -106,7 +106,7 @@ static void process_flags (int argc, char **argv)
         */
        int c;
        static struct option long_options[] = {
-               {"help", no_argument, NULL, 'h'},
+               {"help", no_argument,       NULL, 'h'},
                {"root", required_argument, NULL, 'R'},
                {NULL, 0, NULL, '\0'}
        };

diff --git a/src/su.c b/src/su.c
index 321a9a48c8a5f3b5019aa0e6033e610d096a073d..f5946cc3b5bc54c997fe2fbb4aaa2834720f42b6 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -737,11 +737,11 @@ static void process_flags (int argc, char **argv)
 {
        int c;
        static struct option long_options[] = {
-               {"command", required_argument, NULL, 'c'},
-               {"help", no_argument, NULL, 'h'},
-               {"login", no_argument, NULL, 'l'},
-               {"preserve-environment", no_argument, NULL, 'p'},
-               {"shell", required_argument, NULL, 's'},
+               {"command",              required_argument, NULL, 'c'},
+               {"help",                 no_argument,       NULL, 'h'},
+               {"login",                no_argument,       NULL, 'l'},
+               {"preserve-environment", no_argument,       NULL, 'p'},
+               {"shell",                required_argument, NULL, 's'},
                {NULL, 0, NULL, '\0'}
        };
 

diff --git a/src/useradd.c b/src/useradd.c
index 43869f00e96d340a0c12f26f3bcbca3cd19912fc..da3cd97af8d772ca1d3456b38a1f86c5e5ca5cba 100644 (file)
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -980,31 +980,31 @@ static void process_flags (int argc, char **argv)
                 */
                int c;
                static struct option long_options[] = {
-                       {"base-dir", required_argument, NULL, 'b'},
-                       {"comment", required_argument, NULL, 'c'},
-                       {"home-dir", required_argument, NULL, 'd'},
-                       {"defaults", no_argument, NULL, 'D'},
-                       {"expiredate", required_argument, NULL, 'e'},
-                       {"inactive", required_argument, NULL, 'f'},
-                       {"gid", required_argument, NULL, 'g'},
-                       {"groups", required_argument, NULL, 'G'},
-                       {"help", no_argument, NULL, 'h'},
-                       {"skel", required_argument, NULL, 'k'},
-                       {"key", required_argument, NULL, 'K'},
-                       {"create-home", no_argument, NULL, 'm'},
-                       {"no-create-home", no_argument, NULL, 'M'},
-                       {"no-log-init", no_argument, NULL, 'l'},
-                       {"no-user-group", no_argument, NULL, 'N'},
-                       {"non-unique", no_argument, NULL, 'o'},
-                       {"password", required_argument, NULL, 'p'},
-                       {"system", no_argument, NULL, 'r'},
-                       {"root", required_argument, NULL, 'R'},
-                       {"shell", required_argument, NULL, 's'},
+                       {"base-dir",       required_argument, NULL, 'b'},
+                       {"comment",        required_argument, NULL, 'c'},
+                       {"home-dir",       required_argument, NULL, 'd'},
+                       {"defaults",       no_argument,       NULL, 'D'},
+                       {"expiredate",     required_argument, NULL, 'e'},
+                       {"inactive",       required_argument, NULL, 'f'},
+                       {"gid",            required_argument, NULL, 'g'},
+                       {"groups",         required_argument, NULL, 'G'},
+                       {"help",           no_argument,       NULL, 'h'},
+                       {"skel",           required_argument, NULL, 'k'},
+                       {"key",            required_argument, NULL, 'K'},
+                       {"no-log-init",    no_argument,       NULL, 'l'},
+                       {"create-home",    no_argument,       NULL, 'm'},
+                       {"no-create-home", no_argument,       NULL, 'M'},
+                       {"no-user-group",  no_argument,       NULL, 'N'},
+                       {"non-unique",     no_argument,       NULL, 'o'},
+                       {"password",       required_argument, NULL, 'p'},
+                       {"system",         no_argument,       NULL, 'r'},
+                       {"root",           required_argument, NULL, 'R'},
+                       {"shell",          required_argument, NULL, 's'},
+                       {"uid",            required_argument, NULL, 'u'},
+                       {"user-group",     no_argument,       NULL, 'U'},
 #ifdef WITH_SELINUX
-                       {"selinux-user", required_argument, NULL, 'Z'},
+                       {"selinux-user",   required_argument, NULL, 'Z'},
 #endif
-                       {"uid", required_argument, NULL, 'u'},
-                       {"user-group", no_argument, NULL, 'U'},
                        {NULL, 0, NULL, '\0'}
                };
                while ((c = getopt_long (argc, argv,

diff --git a/src/userdel.c b/src/userdel.c
index 49d3292cd247996abb8e6cc0b8813a47159913cd..c2091cda45d47fe7e029873aae1fbd781360df38 100644 (file)
--- a/src/userdel.c
+++ b/src/userdel.c
@@ -870,10 +870,10 @@ int main (int argc, char **argv)
                 */
                int c;
                static struct option long_options[] = {
-                       {"force", no_argument, NULL, 'f'},
-                       {"help", no_argument, NULL, 'h'},
-                       {"remove", no_argument, NULL, 'r'},
-                       {"root", required_argument, NULL, 'R'},
+                       {"force",  no_argument,       NULL, 'f'},
+                       {"help",   no_argument,       NULL, 'h'},
+                       {"remove", no_argument,       NULL, 'r'},
+                       {"root",   required_argument, NULL, 'R'},
                        {NULL, 0, NULL, '\0'}
                };
                while ((c = getopt_long (argc, argv, "fhrR:",

diff --git a/src/usermod.c b/src/usermod.c
index 8ac7c01294fcbf6facae0e8787387cd77d2ccbfd..0c0f464e341cdad80d0296d8c59a6868f424f597 100644 (file)
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -875,26 +875,26 @@ static void process_flags (int argc, char **argv)
                 */
                int c;
                static struct option long_options[] = {
-                       {"append", no_argument, NULL, 'a'},
-                       {"comment", required_argument, NULL, 'c'},
-                       {"home", required_argument, NULL, 'd'},
-                       {"expiredate", required_argument, NULL, 'e'},
-                       {"inactive", required_argument, NULL, 'f'},
-                       {"gid", required_argument, NULL, 'g'},
-                       {"groups", required_argument, NULL, 'G'},
-                       {"help", no_argument, NULL, 'h'},
-                       {"login", required_argument, NULL, 'l'},
-                       {"lock", no_argument, NULL, 'L'},
-                       {"move-home", no_argument, NULL, 'm'},
-                       {"non-unique", no_argument, NULL, 'o'},
-                       {"password", required_argument, NULL, 'p'},
-                       {"root", required_argument, NULL, 'R'},
+                       {"append",       no_argument,       NULL, 'a'},
+                       {"comment",      required_argument, NULL, 'c'},
+                       {"home",         required_argument, NULL, 'd'},
+                       {"expiredate",   required_argument, NULL, 'e'},
+                       {"inactive",     required_argument, NULL, 'f'},
+                       {"gid",          required_argument, NULL, 'g'},
+                       {"groups",       required_argument, NULL, 'G'},
+                       {"help",         no_argument,       NULL, 'h'},
+                       {"login",        required_argument, NULL, 'l'},
+                       {"lock",         no_argument,       NULL, 'L'},
+                       {"move-home",    no_argument,       NULL, 'm'},
+                       {"non-unique",   no_argument,       NULL, 'o'},
+                       {"password",     required_argument, NULL, 'p'},
+                       {"root",         required_argument, NULL, 'R'},
+                       {"shell",        required_argument, NULL, 's'},
+                       {"uid",          required_argument, NULL, 'u'},
+                       {"unlock",       no_argument,       NULL, 'U'},
 #ifdef WITH_SELINUX
                        {"selinux-user", required_argument, NULL, 'Z'},
 #endif
-                       {"shell", required_argument, NULL, 's'},
-                       {"uid", required_argument, NULL, 'u'},
-                       {"unlock", no_argument, NULL, 'U'},
                        {NULL, 0, NULL, '\0'}
                };
                while ((c = getopt_long (argc, argv,

diff --git a/src/vipw.c b/src/vipw.c
index 181b24b8cdc32207e72d9db57e802b7a49e80746..4e97e8318db3469c16bd03b4a27d30d8590191c1 100644 (file)
--- a/src/vipw.c
+++ b/src/vipw.c
@@ -434,14 +434,14 @@ int main (int argc, char **argv)
                 */
                int c;
                static struct option long_options[] = {
-                       {"group", no_argument, NULL, 'g'},
-                       {"help", no_argument, NULL, 'h'},
-                       {"passwd", no_argument, NULL, 'p'},
-                       {"quiet", no_argument, NULL, 'q'},
-                       {"root", required_argument, NULL, 'R'},
-                       {"shadow", no_argument, NULL, 's'},
+                       {"group",  no_argument,       NULL, 'g'},
+                       {"help",   no_argument,       NULL, 'h'},
+                       {"passwd", no_argument,       NULL, 'p'},
+                       {"quiet",  no_argument,       NULL, 'q'},
+                       {"root",   required_argument, NULL, 'R'},
+                       {"shadow", no_argument,       NULL, 's'},
 #ifdef WITH_TCB
-                       {"user", required_argument, NULL, 'u'},
+                       {"user",   required_argument, NULL, 'u'},
 #endif                         /* WITH_TCB */
                        {NULL, 0, NULL, '\0'}
                };