diff options
| author | Jim Meyering <jim@meyering.net> | 1999-04-04 15:44:26 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1999-04-04 15:44:26 +0000 |
| commit | d815c152dfb4d796fce6debeaaf14f2ae5534337 (patch) | |
| tree | bd7ddbcf36af5d84e3485faeaeb8ea38c8d58579 /src/paste.c | |
| parent | 25abb410d417faa40faa7833c55e19ee2819f804 (diff) | |
| download | coreutils-d815c152dfb4d796fce6debeaaf14f2ae5534337.tar.xz | |
Standardize --help and --version processing.
Diffstat (limited to 'src/paste.c')
| -rw-r--r-- | src/paste.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/paste.c b/src/paste.c index 465c87205..c77075f17 100644 --- a/src/paste.c +++ b/src/paste.c @@ -45,7 +45,6 @@ #include <sys/types.h> #include "system.h" #include "error.h" -#include "long-options.h" /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "paste" @@ -83,6 +82,8 @@ static struct option const longopts[] = { {"serial", no_argument, 0, 's'}, {"delimiters", required_argument, 0, 'd'}, + {GETOPT_HELP_OPTION_DECL}, + {GETOPT_VERSION_OPTION_DECL}, {0, 0, 0, 0} }; @@ -436,9 +437,6 @@ main (int argc, char **argv) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); - have_read_stdin = 0; serial_merge = 0; delims = default_delims; @@ -463,6 +461,10 @@ main (int argc, char **argv) serial_merge++; break; + case_GETOPT_HELP_CHAR; + + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + default: usage (1); } |