TODO: add an item for a chmod optimization

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

diff --git a/src/whoami.c b/src/whoami.c
index c113ba3..75bb9a6 100644 (file)
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -1,10 +1,12 @@
 /* whoami -- print effective userid
-   Copyright (C) 89,90, 1991-1997, 1999-2002 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 89,90, 1991-1997, 1999-2002, 2004, 2005, 2007-2008
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Equivalent to `id -un'. */
 /* Written by Richard Mlynarik. */
@@ -25,38 +26,32 @@
 #include <getopt.h>
 
 #include "system.h"
+#include "error.h"
 #include "long-options.h"
+#include "quote.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "whoami"
 
-#define AUTHORS "Richard Mlynarik"
-
-/* The name this program was run with. */
-char *program_name;
-
-static struct option const long_options[] =
-{
-  {0, 0, 0, 0}
-};
+#define AUTHORS proper_name ("Richard Mlynarik")
 
 void
 usage (int status)
 {
-  if (status != 0)
+  if (status != EXIT_SUCCESS)
     fprintf (stderr, _("Try `%s --help' for more information.\n"),
             program_name);
   else
     {
       printf (_("Usage: %s [OPTION]...\n"), program_name);
       fputs (_("\
-Print the user name associated with the current effective user id.\n\
+Print the user name associated with the current effective user ID.\n\
 Same as id -un.\n\
 \n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }
@@ -64,36 +59,28 @@ Same as id -un.\n\
 int
 main (int argc, char **argv)
 {
-  register struct passwd *pw;
-  register uid_t uid;
-  int c;
+  struct passwd *pw;
+  uid_t uid;
 
   initialize_main (&argc, &argv);
-  program_name = argv[0];
+  set_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,
-                     usage, AUTHORS, NULL);
+  parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version,
+                     usage, AUTHORS, (char const *) NULL);
+  if (getopt_long (argc, argv, "", NULL, NULL) != -1)
+    usage (EXIT_FAILURE);
 
-  while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
+  if (optind != argc)
     {
-      switch (c)
-       {
-       case 0:
-         break;
-
-       default:
-         usage (EXIT_FAILURE);
-       }
+      error (0, 0, _("extra operand %s"), quote (argv[optind]));
+      usage (EXIT_FAILURE);
     }
 
-  if (optind != argc)
-    usage (EXIT_FAILURE);
-
   uid = geteuid ();
   pw = getpwuid (uid);
   if (pw)
@@ -101,7 +88,7 @@ main (int argc, char **argv)
       puts (pw->pw_name);
       exit (EXIT_SUCCESS);
     }
-  fprintf (stderr, _("%s: cannot find username for UID %u\n"),
-          program_name, (unsigned) uid);
+  fprintf (stderr, _("%s: cannot find name for user ID %lu\n"),
+          program_name, (unsigned long int) uid);
   exit (EXIT_FAILURE);
 }