From: Jim Meyering <jim@meyering.net>
Date: Thu, 17 Jun 2004 14:34:07 +0000 (+0000)
Subject: (main): Recognize --help and --version even if POSIXLY_CORRECT is set.
X-Git-Tag: v5.3.0~1325
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72f51d66bf8e5364edfa0975c96ddebcaefd089e;p=thirdparty%2Fcoreutils.git

(main): Recognize --help and --version even if POSIXLY_CORRECT is set.
---

diff --git a/src/true.c b/src/true.c
index e4508cbf11..192003b67d 100644
--- a/src/true.c
+++ b/src/true.c
@@ -56,8 +56,8 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   /* Recognize --help or --version only if it's the only command-line
-     argument and if POSIXLY_CORRECT is not set.  */
-  if (argc == 2 && getenv ("POSIXLY_CORRECT") == NULL)
+     argument.  */
+  if (argc == 2)
     {
       if (STREQ (argv[1], "--help"))
 	usage (EXIT_SUCCESS);
diff --git a/src/yes.c b/src/yes.c
index f6f26e5a6d..56b15f7363 100644
--- a/src/yes.c
+++ b/src/yes.c
@@ -71,10 +71,16 @@ main (int argc, char **argv)
 
   atexit (close_stdout);
 
-  /* Don't recognize --help or --version if POSIXLY_CORRECT is set.  */
-  if (getenv ("POSIXLY_CORRECT") == NULL)
-    parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-			usage, AUTHORS, (char const *) NULL);
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
+		      usage, AUTHORS, (char const *) NULL);
+
+  /* The above handles --help and --version.
+     Since there is no other invocation of getopt, handle `--' here.  */
+  if (1 < argc && STREQ (argv[1], "--"))
+    {
+      --argc;
+      ++argv;
+    }
 
   if (argc == 1)
     {