(WRITTEN_BY): Rename from AUTHORS.

[platform/upstream/coreutils.git] / src / whoami.c

diff --git a/src/whoami.c b/src/whoami.c
index 9936a85..be7bc04 100644 (file)
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -1,5 +1,5 @@
 /* whoami -- print effective userid
-   Copyright (C) 89,90,91,92,93,94,95,96,1997 Free Software Foundation, Inc.
+   Copyright (C) 89,90, 1991-1997, 1999-2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,24 +25,22 @@
 #include <getopt.h>
 
 #include "system.h"
+#include "long-options.h"
 
-/* The name this program was run with. */
-char *program_name;
+/* The official name of this program (e.g., no `g' prefix).  */
+#define PROGRAM_NAME "whoami"
 
-/* If nonzero, display usage information and exit.  */
-static int show_help;
+#define WRITTEN_BY _("Written by Richard Mlynarik.")
 
-/* If nonzero, print the version on standard output and exit.  */
-static int show_version;
+/* The name this program was run with. */
+char *program_name;
 
 static struct option const long_options[] =
 {
-  {"help", no_argument, &show_help, 1},
-  {"version", no_argument, &show_version, 1},
   {0, 0, 0, 0}
 };
 
-static void
+void
 usage (int status)
 {
   if (status != 0)
@@ -51,13 +49,14 @@ usage (int status)
   else
     {
       printf (_("Usage: %s [OPTION]...\n"), program_name);
-      printf (_("\
+      fputs (_("\
 Print the user name associated with the current effective user id.\n\
 Same as id -un.\n\
 \n\
-  --help      display this help and exit\n\
-  --version   output version information and exit\n"));
-      puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
+"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }
@@ -69,11 +68,17 @@ main (int argc, char **argv)
   register uid_t uid;
   int c;
 
+  initialize_main (&argc, &argv);
   program_name = argv[0];
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
+  atexit (close_stdout);
+
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+                     WRITTEN_BY, usage);
+
   while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {
       switch (c)
@@ -82,31 +87,21 @@ main (int argc, char **argv)
          break;
 
        default:
-         usage (1);
+         usage (EXIT_FAILURE);
        }
     }
 
-  if (show_version)
-    {
-      printf ("whoami (%s) %s\n", GNU_PACKAGE, VERSION);
-      exit (0);
-    }
-
-  if (show_help)
-    usage (0);
-
-
   if (optind != argc)
-    usage (1);
+    usage (EXIT_FAILURE);
 
   uid = geteuid ();
   pw = getpwuid (uid);
   if (pw)
     {
       puts (pw->pw_name);
-      exit (0);
+      exit (EXIT_SUCCESS);
     }
   fprintf (stderr, _("%s: cannot find username for UID %u\n"),
           program_name, (unsigned) uid);
-  exit (1);
+  exit (EXIT_FAILURE);
 }