diff options
-rw-r--r-- | src/chgrp.c | 12 | ||||
-rw-r--r-- | src/chmod.c | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/src/chgrp.c b/src/chgrp.c index e6e21dcd9..891c275e7 100644 --- a/src/chgrp.c +++ b/src/chgrp.c @@ -27,10 +27,13 @@ #include "closeout.h" #include "error.h" #include "group-member.h" -#include "long-options.h" #include "savedir.h" +#include "version-etc.h" #include "xstrtoul.h" +/* The official name of this program (e.g., no `g' prefix). */ +#define PROGRAM_NAME "chgrp" + /* MAXUID may come from limits.h *or* sys/params.h (via system.h) above. */ #ifndef MAXUID # define MAXUID UID_T_MAX @@ -107,6 +110,8 @@ static struct option const long_options[] = {"quiet", no_argument, 0, 'f'}, {"reference", required_argument, 0, CHAR_MAX + 1}, {"verbose", no_argument, 0, 'v'}, + {GETOPT_HELP_OPTION_DECL}, + {GETOPT_VERSION_OPTION_DECL}, {0, 0, 0, 0} }; @@ -328,9 +333,6 @@ main (int argc, char **argv) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - parse_long_options (argc, argv, "chgrp", GNU_PACKAGE, VERSION, - "David MacKenzie", usage); - recurse = force_silent = 0; while ((optc = getopt_long (argc, argv, "Rcfhv", long_options, NULL)) != -1) @@ -357,6 +359,8 @@ main (int argc, char **argv) case 'v': verbosity = V_high; break; + case_GETOPT_HELP_CHAR; + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, "David MacKenzie"); default: usage (1); } diff --git a/src/chmod.c b/src/chmod.c index 748ee2189..40597b7d1 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -26,9 +26,12 @@ #include "closeout.h" #include "error.h" #include "filemode.h" -#include "long-options.h" #include "modechange.h" #include "savedir.h" +#include "version-etc.h" + +/* The official name of this program (e.g., no `g' prefix). */ +#define PROGRAM_NAME "chmod" enum Change_status { @@ -79,6 +82,8 @@ static struct option const long_options[] = {"quiet", no_argument, 0, 'f'}, {"reference", required_argument, 0, CHAR_MAX + 1}, {"verbose", no_argument, 0, 'v'}, + {GETOPT_HELP_OPTION_DECL}, + {GETOPT_VERSION_OPTION_DECL}, {0, 0, 0, 0} }; @@ -273,9 +278,6 @@ main (int argc, char **argv) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - parse_long_options (argc, argv, "chmod", GNU_PACKAGE, VERSION, - "David MacKenzie", usage); - recurse = force_silent = 0; while (1) @@ -323,6 +325,8 @@ main (int argc, char **argv) case 'v': verbosity = V_high; break; + case_GETOPT_HELP_CHAR; + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, "David MacKenzie"); default: usage (1); } |