diff options
| -rw-r--r-- | src/true.c | 4 | ||||
| -rw-r--r-- | src/yes.c | 14 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/true.c b/src/true.c index e4508cbf1..192003b67 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); @@ -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) { |