Skip to content

fs: report source and destination files in error messages #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fs: report source and destination files in error messages #293

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions src/node_file.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
#include <errno.h>
#include <limits.h>

#include <string>

#if defined(__MINGW32__) || defined(_MSC_VER)
# include <io.h>
#endif
Expand Down Expand Up @@ -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);
Expand All @@ -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,
Expand Down Expand Up @@ -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); \
} \
Expand Down