commit 6ba719100115ec788bcbc4276a1b4c31e937e855
author Rob Landley <rob@landley.net> Mon May 30 13:43:17 2016 -0500
committer Rob Landley <rob@landley.net> Mon May 30 13:43:17 2016 -0500
tree aa2a50ed24d766c800351b4972a9476074d135a7
parent bc8139a3a011568727219d3f1375061612e901ed

Add output path to cp error message filenames.

toys/posix/cp.c

diff --git a/toys/posix/cp.c b/toys/posix/cp.c
index ea1ef6f..d21af2f 100644
--- a/toys/posix/cp.c
+++ b/toys/posix/cp.c
@@ -345,7 +345,19 @@
         err = "%s";
   }
 
-  if (err) perror_msg(err, catch);
+  if (err) {
+    char *f = 0;
+
+    if (catch == try->name) {
+      f = dirtree_path(try, 0);
+      while (try->parent) try = try->parent;
+      catch = xmprintf("%s%s", TT.destname, f+strlen(try->name));
+      free(f);
+      f = catch;
+    }
+    perror_msg(err, catch);
+    free(f);
+  }
   return 0;
 }