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.
(do_copy): Likewise.

1 files changed, 6 insertions, 7 deletions

diff --git a/src/cp.c b/src/cp.c
index 4f2f1b0c0..3bcdd0a64 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -478,14 +478,13 @@ do_copy (int n_files, char **file, const char *target_directory,
   int ret = 0;
   int dest_is_dir = 0;
 
-  if (n_files <= 0)
+  if (n_files <= !target_directory)
     {
-      error (0, 0, _("missing file argument"));
-      usage (EXIT_FAILURE);
-    }
-  if (n_files == 1 && !target_directory)
-    {
-      error (0, 0, _("missing destination file"));
+      if (n_files == 0)
+	error (0, 0, _("missing file operand"));
+      else
+	error (0, 0, _("missing destination file operand after %s"),
+	       quote (file[0]));
       usage (EXIT_FAILURE);
     }