From f0a63185c93a50088831b9ddf67de6971a851cca Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sun, 6 Nov 2011 18:39:59 +0000 Subject: [PATCH] * 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. --- ChangeLog | 9 +++++++++ src/chage.c | 16 ++++++++-------- src/chgpasswd.c | 10 +++++----- src/chpasswd.c | 16 ++++++++-------- src/chsh.c | 4 ++-- src/faillog.c | 14 +++++++------- src/gpasswd.c | 16 ++++++++-------- src/groupadd.c | 16 ++++++++-------- src/groupdel.c | 2 +- src/groupmems.c | 12 ++++++------ src/groupmod.c | 12 ++++++------ src/grpconv.c | 2 +- src/grpunconv.c | 2 +- src/lastlog.c | 42 +++++++++++++++++++++--------------------- src/newusers.c | 16 ++++++++++------ src/passwd.c | 36 ++++++++++++++++++------------------ src/pwconv.c | 2 +- src/pwunconv.c | 2 +- src/su.c | 10 +++++----- src/useradd.c | 46 +++++++++++++++++++++++----------------------- src/userdel.c | 8 ++++---- src/usermod.c | 34 +++++++++++++++++----------------- src/vipw.c | 14 +++++++------- 23 files changed, 177 insertions(+), 164 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab59d79c..234893c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-10-31 Nicolas François + + * 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 * 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 40e465f4..47027835 100644 --- 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 5c4ded6b..af533387 100644 --- 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 f945f5df..ef54a486 100644 --- 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 132ba17b..c038f697 100644 --- 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 5fdd485d..632e638e 100644 --- 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 7dd3fae7..1b830346 100644 --- 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 eb1c4e16..b4c057cd 100644 --- 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 1a7de709..9bf5863f 100644 --- 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 0643d707..e1f77b7e 100644 --- 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 5b139df5..96de082a 100644 --- 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 5f839c95..4568bc14 100644 --- 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 0c2ef4c3..89fb97b2 100644 --- 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 091d8600..ed9484aa 100644 --- a/src/lastlog.c +++ b/src/lastlog.c @@ -211,33 +211,17 @@ 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': - { - unsigned long days; - if (getulong (optarg, &days) == 0) { - fprintf (stderr, - _("%s: invalid numeric argument '%s'\n"), - Prog, optarg); - exit (EXIT_FAILURE); - } - seconds = (time_t) days * DAY; - tflg = true; - break; - } case 'b': { unsigned long inverse_days; @@ -251,8 +235,24 @@ int main (int argc, char **argv) bflg = true; break; } + case 'h': + usage (EXIT_SUCCESS); + /*@notreached@*/break; case 'R': /* no-op, handled in process_root_flag () */ break; + case 't': + { + unsigned long days; + if (getulong (optarg, &days) == 0) { + fprintf (stderr, + _("%s: invalid numeric argument '%s'\n"), + Prog, optarg); + exit (EXIT_FAILURE); + } + seconds = (time_t) days * DAY; + tflg = true; + break; + } case 'u': { const struct passwd *pwent; diff --git a/src/newusers.c b/src/newusers.c index e0bfa226..1f9e3570 100644 --- 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 0e5ccf80..e62d3fd9 100644 --- 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 082095c6..cb4ae4f7 100644 --- 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 c108fe56..9b74614c 100644 --- 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 321a9a48..f5946cc3 100644 --- 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 43869f00..da3cd97a 100644 --- 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 49d3292c..c2091cda 100644 --- 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 8ac7c012..0c0f464e 100644 --- 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 181b24b8..4e97e831 100644 --- 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'} };