1 files changed, 4 insertions, 17 deletions
diff --git a/src/whoami.c b/src/whoami.c
index 2ecf9d8c7..3c021ab19 100644
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -25,20 +25,13 @@
 #include <getopt.h>
 
 #include "system.h"
+#include "long-options.h"
 
 /* The name this program was run with. */
 char *program_name;
 
-/* If nonzero, display usage information and exit.  */
-static int show_help;
-
-/* If nonzero, print the version on standard output and exit.  */
-static int show_version;
-
 static struct option const long_options[] =
 {
-  {"help", no_argument, &show_help, 1},
-  {"version", no_argument, &show_version, 1},
   {0, 0, 0, 0}
 };
 
@@ -74,6 +67,9 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
+  parse_long_options (argc, argv, "whoami", GNU_PACKAGE, VERSION,
+		      "Richard Mlynarik", usage);
+
   while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {
       switch (c)
@@ -86,15 +82,6 @@ main (int argc, char **argv)
 	}
     }
 
-  if (show_version)
-    {
-      printf ("whoami (%s) %s\n", GNU_PACKAGE, VERSION);
-      exit (0);
-    }
-
-  if (show_help)
-    usage (0);
-
   if (optind != argc)
     usage (1);