From 7b1967351c80c56abc5b8c6c4a66ffba80050c5c Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 13 Jan 2009 21:59:35 -0700 Subject: test, echo, printf: don't accept option abbreviation * src/test.c (main): Directly parse accepted options, thus avoiding abbreviations. * src/echo.c (main): Likewise. * src/printf.c (main): Likewise. --- src/echo.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'src/echo.c') diff --git a/src/echo.c b/src/echo.c index c4b7ca939..91cce86d6 100644 --- a/src/echo.c +++ b/src/echo.c @@ -124,9 +124,20 @@ main (int argc, char **argv) atexit (close_stdout); - if (allow_options) - parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, - usage, AUTHORS, (char const *) NULL); + /* We directly parse options, rather than use parse_long_options, in + order to avoid accepting abbreviations. */ + if (allow_options && argc == 2) + { + if (STREQ (argv[1], "--help")) + usage (EXIT_SUCCESS); + + if (STREQ (argv[1], "--version")) + { + version_etc (stdout, PROGRAM_NAME, PACKAGE_NAME, Version, AUTHORS, + (char *) NULL); + exit (EXIT_SUCCESS); + } + } --argc; ++argv; -- cgit v1.2.3-54-g00ecf