diff options
author | Jim Meyering <jim@meyering.net> | 1999-03-31 05:52:46 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 1999-03-31 05:52:46 +0000 |
commit | fdd07e3d2b4113a076cbb862115c43c9285e8b55 (patch) | |
tree | 7639c6587c2472b375e7175b32b1ca6114be0f9d /src/uname.c | |
parent | 419aa421810a797b42eabc72dd767d26941bc17b (diff) | |
download | coreutils-fdd07e3d2b4113a076cbb862115c43c9285e8b55.tar.xz |
No longer include long-options.h.
[long_options]: Add entries for --help and --version.
Remove parse_long_options call.
(main) [getopt switch]: Add a case for each of --help and --version.
Diffstat (limited to 'src/uname.c')
-rw-r--r-- | src/uname.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/uname.c b/src/uname.c index 4017dbe90..f199ad065 100644 --- a/src/uname.c +++ b/src/uname.c @@ -40,7 +40,6 @@ #include "system.h" #include "error.h" -#include "long-options.h" /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "uname" @@ -82,6 +81,8 @@ static struct option const long_options[] = {"sysname", no_argument, NULL, 's'}, {"processor", no_argument, NULL, 'p'}, {"all", no_argument, NULL, 'a'}, + {GETOPT_HELP_OPTION_DECL}, + {GETOPT_VERSION_OPTION_DECL}, {NULL, 0, NULL, 0} }; @@ -123,9 +124,6 @@ main (int argc, char **argv) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, - AUTHORS, usage); - toprint = 0; while ((c = getopt_long (argc, argv, "snrvpma", long_options, NULL)) != -1) @@ -164,6 +162,10 @@ main (int argc, char **argv) PRINT_PROCESSOR | PRINT_VERSION | PRINT_MACHINE); break; + case_GETOPT_HELP_CHAR; + + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + default: usage (1); } |