From 4976708c0044495586f8636446c2e1ca0a023202 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sat, 6 Sep 2008 22:20:19 +0000 Subject: [PATCH] * src/gpasswd.c: Document the long options in the usage. --- ChangeLog | 4 ++++ src/gpasswd.c | 24 ++++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8be1c3b2..f0b77dd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-09-07 Nicolas François + + * src/gpasswd.c: Document the long options in the usage. + 2008-09-06 Nicolas François * NEWS: Added configure --enable-account-tools-setuid (default) / diff --git a/src/gpasswd.c b/src/gpasswd.c index 02f367e1..517008ed 100644 --- a/src/gpasswd.c +++ b/src/gpasswd.c @@ -119,15 +119,27 @@ static void change_passwd (struct group *gr); */ static void usage (void) { - fprintf (stderr, _("Usage: %s [-r|-R] group\n"), Prog); - fprintf (stderr, _(" %s [-a user] group\n"), Prog); - fprintf (stderr, _(" %s [-d user] group\n"), Prog); -#ifdef SHADOWGRP fprintf (stderr, - _(" %s [-A user,...] [-M user,...] group\n"), Prog); + _("Usage: %s [option] GROUP\n" + "\n" + "Options:\n" + " -a, --add USER add USER to GROUP\n" + " -d, --delete USER remove USER from GROUP\n" + " -r, --remove-password remove the GROUP's password\n" + " -R, --restrict restrict access to GROUP to its members\n" + " -M, --members USER,... set the list of members of GROUP\n" + "%s\n" + "\n"), + Prog, +#ifdef SHADOWGRP + _(" -A, --administrators ADMIN,...\n" + " set the list of administrators for GROUP\n" + "Except for the -A and -M options, the options cannot be combined.\n") + #else - fprintf (stderr, _(" %s [-M user,...] group\n"), Prog); + _("The options cannot be combined.\n") #endif + ); exit (E_USAGE); }