Fix test-fs-error-messages.js

ry · ry · commit f5e486ebabc7 · 2011-09-04T18:48:19.000-07:00
diff --git a/deps/uv/src/unix/fs.c b/deps/uv/src/unix/fs.c
@@ -305,6 +305,7 @@ int uv_fs_readdir(uv_loop_t* loop, uv_fs_t* req, const char* path, int flags,
     DIR* dir = opendir(path);
     if (!dir) {
       uv_err_new(loop, errno);
+      req->result = -1;
       return -1;
     }
 
@@ -333,6 +334,7 @@ int uv_fs_readdir(uv_loop_t* loop, uv_fs_t* req, const char* path, int flags,
     r = closedir(dir);
     if (r) {
       uv_err_new(loop, errno);
+      req->result = -1;
       return -1;
     }
   }
diff --git a/src/node_file.cc b/src/node_file.cc
@@ -86,11 +86,14 @@ static void After(uv_fs_t *req) {
   if (req->result == -1) {
     // If the request doesn't have a path parameter set.
     
-    // XXX if (!req->arg0) {
+    if (!req->path) {
       argv[0] = ErrnoException(req->errorno);
-    // XXX } else {
-    // XXX   argv[0] = ErrnoException(req->errorno, NULL, "", static_cast<const char*>(req->arg0));
-    // XXX}
+    } else {
+      argv[0] = ErrnoException(req->errorno,
+                               NULL,
+                               "",
+                               static_cast<const char*>(req->path));
+    }
   } else {
     // error value is empty or null for non-error.
     argv[0] = Local<Value>::New(Null());
@@ -214,7 +217,7 @@ struct fs_req_wrap {
 #define SYNC_CALL(func, path, ...)                                \
   fs_req_wrap req_wrap;                                           \
   uv_fs_##func(uv_default_loop(), &req_wrap.req, __VA_ARGS__, NULL); \
-  if (req_wrap.req.result == -1) {                                \
+  if (req_wrap.req.result < 0) {                                  \
     return ThrowException(                                        \
       ErrnoException(req_wrap.req.errorno, #func, "", path));     \
   }
@@ -334,7 +337,7 @@ static Handle<Value> Stat(const Arguments& args) {
   if (args[1]->IsFunction()) {
     ASYNC_CALL(stat, args[1], *path)
   } else {
-    SYNC_CALL(stat, 0, *path)
+    SYNC_CALL(stat, *path, *path)
     return scope.Close(BuildStatsObject((NODE_STAT_STRUCT*)SYNC_REQ.ptr));
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -305,6 +305,7 @@ int uv_fs_readdir(uv_loop_t* loop, uv_fs_t* req, const char* path, int flags,`
`305`	`305`	`DIR* dir = opendir(path);`
`306`	`306`	`if (!dir) {`
`307`	`307`	`uv_err_new(loop, errno);`
	`308`	`+ req->result = -1;`
`308`	`309`	`return -1;`
`309`	`310`	`}`
`310`	`311`
`@@ -333,6 +334,7 @@ int uv_fs_readdir(uv_loop_t* loop, uv_fs_t* req, const char* path, int flags,`
`333`	`334`	`r = closedir(dir);`
`334`	`335`	`if (r) {`
`335`	`336`	`uv_err_new(loop, errno);`
	`337`	`+ req->result = -1;`
`336`	`338`	`return -1;`
`337`	`339`	`}`
`338`	`340`	`}`