From 68d6a12fd512c8ac90c389c73ed534265ba457fb Mon Sep 17 00:00:00 2001
From: Caitlin Potter <caitpotter88@gmail.com>
Date: Sun, 11 Jan 2015 16:27:48 -0500
Subject: [PATCH] fs: report source and destination files in error messages

---
 src/node_file.cc | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/node_file.cc b/src/node_file.cc
index 1077929fcf47aa..dd495fb146df72 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -38,6 +38,8 @@
 #include <errno.h>
 #include <limits.h>
 
+#include <string>
+
 #if defined(__MINGW32__) || defined(_MSC_VER)
 # include <io.h>
 #endif
@@ -122,6 +124,18 @@ static inline bool IsInt64(double x) {
 }
 
 
+static std::string srcdestError(const char *syscall, const char *source,
+                                const char *destination) {
+  std::string errmsg(syscall);
+  return errmsg.
+      append(" '").
+      append(source).
+      append("' -> '").
+      append(destination).
+      append("'");
+}
+
+
 static void After(uv_fs_t *req) {
   FSReqWrap* req_wrap = static_cast<FSReqWrap*>(req->data);
   CHECK_EQ(&req_wrap->req_, req);
@@ -142,14 +156,10 @@ static void After(uv_fs_t *req) {
     // If the request doesn't have a path parameter set.
     if (req->path == nullptr) {
       argv[0] = UVException(req->result, nullptr, req_wrap->syscall());
-    } else if ((req->result == UV_EEXIST ||
-                req->result == UV_ENOTEMPTY ||
-                req->result == UV_EPERM) &&
-               req_wrap->dest_len() > 0) {
-      argv[0] = UVException(req->result,
-                            nullptr,
-                            req_wrap->syscall(),
-                            req_wrap->dest());
+    } else if (req_wrap->dest_len() > 0) {
+      const char* syscall = req_wrap->syscall();
+      std::string errmsg = srcdestError(syscall, req->path, req_wrap->dest());
+      argv[0] = UVException(req->result, nullptr, errmsg.c_str());
     } else {
       argv[0] = UVException(req->result,
                             nullptr,
@@ -300,11 +310,9 @@ struct fs_req_wrap {
                          __VA_ARGS__,                                         \
                          nullptr);                                            \
   if (err < 0) {                                                              \
-    if (dest != nullptr &&                                                    \
-        (err == UV_EEXIST ||                                                  \
-         err == UV_ENOTEMPTY ||                                               \
-         err == UV_EPERM)) {                                                  \
-      return env->ThrowUVException(err, #func, "", dest);                     \
+    if (dest != nullptr) {                                                    \
+      std::string errmsg = srcdestError(#func, path, dest);                   \
+      return env->ThrowUVException(err, nullptr, errmsg.c_str());             \
     } else {                                                                  \
       return env->ThrowUVException(err, #func, "", path);                     \
     }                                                                         \