diff options
author | Jim Meyering <jim@meyering.net> | 2004-06-21 15:03:35 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2004-06-21 15:03:35 +0000 |
commit | 1ce7b61d0ea270b0c463198afca1cd0e214192fb (patch) | |
tree | 947f954d8a82091744d3809da651319e9d82001d /src/basename.c | |
parent | 110be46897450cd5fa90e3a955ab9092db128cea (diff) | |
download | coreutils-1ce7b61d0ea270b0c463198afca1cd0e214192fb.tar.xz |
(main): Standardize on the diagnostics given when someone gives
too few operands ("missing operand after `xxx'") or
too many operands ("extra operand `xxx'").
Include "quote.h" and/or "error.h" if it wasn't already being included.
Diffstat (limited to 'src/basename.c')
-rw-r--r-- | src/basename.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/basename.c b/src/basename.c index df6d33731..261200206 100644 --- a/src/basename.c +++ b/src/basename.c @@ -33,6 +33,7 @@ #include "long-options.h" #include "dirname.h" #include "error.h" +#include "quote.h" /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "basename" @@ -109,10 +110,15 @@ main (int argc, char **argv) ++argv; } - if (argc <= 1 || argc > 3) + if (argc < 2) { - error (0, 0, (argc <= 1 ? _("too few arguments") - : _("too many arguments"))); + error (0, 0, _("missing operand")); + usage (EXIT_FAILURE); + } + + if (3 < argc) + { + error (0, 0, _("extra operand %s"), quote (argv[3])); usage (EXIT_FAILURE); } |