(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.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/du.c b/src/du.c
index b8fe68c73..a4c9c03ef 100644
--- a/src/du.c
+++ b/src/du.c
@@ -735,9 +735,12 @@ main (int argc, char **argv)
       /* When using --files0-from=F, you may not specify any files
 	 on the command-line.  */
       if (optind < argc)
-	error (EXIT_FAILURE, 0,
-	       _("%s: you may not specify command-line arguments with\
- --files0-from"), quotearg_colon (argv[optind]));
+	{
+	  error (0, 0, _("extra operand %s"), quote (argv[optind]));
+	  fprintf (stderr, "%s\n",
+		   _("File operands cannot be combined with --files0-from."));
+	  usage (EXIT_FAILURE);
+	}
 
       istream = (STREQ (files_from, "-") ? stdin : fopen (files_from, "r"));
       if (istream == NULL)