diff options
| author | Eric Blake <ebb9@byu.net> | 2009-01-13 21:59:35 -0700 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2009-01-14 14:32:13 -0700 |
| commit | 7b1967351c80c56abc5b8c6c4a66ffba80050c5c (patch) | |
| tree | 50837c792ec3c309bf36f03db3b160b3750832b6 /src/printf.c | |
| parent | d01338eb3d30e5634f1b4d4179c229f54eea0b44 (diff) | |
| download | coreutils-7b1967351c80c56abc5b8c6c4a66ffba80050c5c.tar.xz | |
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.
Diffstat (limited to 'src/printf.c')
| -rw-r--r-- | src/printf.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/printf.c b/src/printf.c index c50995183..63351f0e3 100644 --- a/src/printf.c +++ b/src/printf.c @@ -1,5 +1,5 @@ /* printf - format and print data - Copyright (C) 1990-2008 Free Software Foundation, Inc. + Copyright (C) 1990-2009 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 @@ -645,8 +645,20 @@ main (int argc, char **argv) posixly_correct = (getenv ("POSIXLY_CORRECT") != NULL); - 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 (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); + } + } /* The above handles --help and --version. Since there is no other invocation of getopt, handle `--' here. */ |