*** empty log message ***

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

diff --git a/src/printenv.c b/src/printenv.c
index 1ecfaf1..e06b704 100644 (file)
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -1,5 +1,5 @@
 /* printenv -- print all or part of environment
-   Copyright (C) 1989-1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1989-1997, 1999-2005 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
@@ -13,7 +13,7 @@
 
    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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Usage: printenv [variable...]
 
@@ -24,6 +24,7 @@
    Exit status:
    0 if all variables specified were found
    1 if not
+   2 if some other error occurred
 
    David MacKenzie and Richard Mlynarik */
 
@@ -33,40 +34,41 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "long-options.h"
 
+/* Exit status for syntax errors, etc.  */
+enum { PRINTENV_FAILURE = 2 };
+
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "printenv"
 
-#define AUTHORS "David MacKenzie and Richard Mlynarik"
+#define AUTHORS "David MacKenzie", "Richard Mlynarik"
 
 /* The name this program was run with. */
 char *program_name;
 
-static struct option const long_options[] =
-{
-  {0, 0, 0, 0}
-};
-
 extern char **environ;
 
 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]... [VARIABLE]...\n"), program_name);
       printf (_("\
+Usage: %s [VARIABLE]...\n\
+  or:  %s OPTION\n\
 If no environment VARIABLE specified, print them all.\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>."));
+"),
+             program_name, program_name);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
+      printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }
@@ -77,40 +79,36 @@ main (int argc, char **argv)
   char **env;
   char *ep, *ap;
   int i;
-  int matches = 0;
-  int c;
-  int exit_status;
+  bool ok;
 
+  initialize_main (&argc, &argv);
   program_name = argv[0];
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
-
-  while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
-    {
-      switch (c)
-       {
-       case 0:
-         break;
+  initialize_exit_failure (PRINTENV_FAILURE);
+  atexit (close_stdout);
 
-       default:
-         usage (1);
-       }
-    }
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+                     usage, AUTHORS, (char const *) NULL);
+  if (getopt_long (argc, argv, "+", NULL, NULL) != -1)
+    usage (PRINTENV_FAILURE);
 
-  if (optind == argc)
+  if (optind >= argc)
     {
       for (env = environ; *env != NULL; ++env)
        puts (*env);
-      exit_status = 0;
+      ok = true;
     }
   else
     {
+      int matches = 0;
+
       for (i = optind; i < argc; ++i)
        {
+         bool matched = false;
+
          for (env = environ; *env; ++env)
            {
              ep = *env;
@@ -120,16 +118,17 @@ main (int argc, char **argv)
                  if (*ep == '=' && *ap == '\0')
                    {
                      puts (ep + 1);
-                     ++matches;
+                     matched = true;
                      break;
                    }
                }
            }
+
+         matches += matched;
        }
-      exit_status = (matches != argc - optind);
-    }
 
-  close_stdout_status (2);
+      ok = (matches == argc - optind);
+    }
 
-  exit (exit_status);
+  exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
 }