diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rmdir.c | 14 | ||||
| -rw-r--r-- | src/shred.c | 16 | ||||
| -rw-r--r-- | src/touch.c | 18 |
3 files changed, 35 insertions, 13 deletions
diff --git a/src/rmdir.c b/src/rmdir.c index 81e437e9f..54605ee43 100644 --- a/src/rmdir.c +++ b/src/rmdir.c @@ -30,7 +30,12 @@ #include "system.h" #include "closeout.h" #include "error.h" -#include "long-options.h" +#include "version-etc.h" + +/* The official name of this program (e.g., no `g' prefix). */ +#define PROGRAM_NAME "rmdir" + +#define AUTHORS "David MacKenzie" #ifndef EEXIST # define EEXIST 0 @@ -64,6 +69,8 @@ static struct option const longopts[] = {"path", no_argument, NULL, 'p'}, {"parents", no_argument, NULL, 'p'}, {"verbose", no_argument, NULL, 14}, + {GETOPT_HELP_OPTION_DECL}, + {GETOPT_VERSION_OPTION_DECL}, {NULL, 0, NULL, 0} }; @@ -145,9 +152,6 @@ main (int argc, char **argv) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - parse_long_options (argc, argv, "rmdir", GNU_PACKAGE, VERSION, - "David MacKenzie", usage); - empty_paths = 0; while ((optc = getopt_long (argc, argv, "p", longopts, NULL)) != -1) @@ -165,6 +169,8 @@ main (int argc, char **argv) case 14: verbose = 1; break; + case_GETOPT_HELP_CHAR; + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: usage (1); } diff --git a/src/shred.c b/src/shred.c index 67462868b..748925509 100644 --- a/src/shred.c +++ b/src/shred.c @@ -65,8 +65,13 @@ #include "system.h" #include "closeout.h" #include "error.h" -#include "long-options.h" #include "xstrtoul.h" +#include "version-etc.h" + +/* The official name of this program (e.g., no `g' prefix). */ +#define PROGRAM_NAME "shred" + +#define AUTHORS "Colin Plumb" #define DEFAULT_PASSES 25 /* Default */ @@ -94,6 +99,8 @@ static struct option const long_opts[] = {"preserve", no_argument, NULL, 'p'}, {"verbose", no_argument, NULL, 'v'}, {"zero", required_argument, NULL, 'z'}, + {GETOPT_HELP_OPTION_DECL}, + {GETOPT_VERSION_OPTION_DECL}, {NULL, 0, NULL, 0} }; @@ -1283,9 +1290,6 @@ main (int argc, char **argv) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - parse_long_options (argc, argv, "shred", GNU_PACKAGE, VERSION, - "Colin Plumb", usage); - isaac_seed (&s); memset (&flags, 0, sizeof flags); @@ -1338,6 +1342,10 @@ main (int argc, char **argv) flags.zero_fill = 1; break; + case_GETOPT_HELP_CHAR; + + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + default: usage (1); } diff --git a/src/touch.c b/src/touch.c index b8435ce91..eda5f3e8e 100644 --- a/src/touch.c +++ b/src/touch.c @@ -28,9 +28,15 @@ #include "closeout.h" #include "error.h" #include "getdate.h" -#include "long-options.h" #include "posixtm.h" #include "safe-read.h" +#include "version-etc.h" + +/* The official name of this program (e.g., no `g' prefix). */ +#define PROGRAM_NAME "touch" + +#define AUTHORS \ + "Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie, and Randy Smith" #ifndef STDC_HEADERS time_t time (); @@ -81,6 +87,8 @@ static struct option const longopts[] = {"date", required_argument, 0, 'd'}, {"file", required_argument, 0, 'r'}, {"reference", required_argument, 0, 'r'}, + {GETOPT_HELP_OPTION_DECL}, + {GETOPT_VERSION_OPTION_DECL}, {0, 0, 0, 0} }; @@ -230,10 +238,6 @@ main (int argc, char **argv) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - parse_long_options (argc, argv, "touch", GNU_PACKAGE, VERSION, - "Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie, and Randy Smith", - usage); - change_times = no_create = use_ref = posix_date = flexible_date = 0; newtime = (time_t) -1; @@ -286,6 +290,10 @@ main (int argc, char **argv) time_args, time_masks); break; + case_GETOPT_HELP_CHAR; + + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + default: usage (1); } |