Upgrade libuv to 4197fc7

and use return value from sync uv_fs functions
nodejs · Sep 14, 2011 · a6ef3eb · a6ef3eb
1 parent 7096600
commit a6ef3eb
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 84 deletions.
diff --git a/deps/uv/src/unix/eio/eio.c b/deps/uv/src/unix/eio/eio.c
@@ -1812,17 +1812,7 @@ eio__scandir (eio_req *req, etp_worker *self)
 #endif
 
   if (req->flags & EIO_FLAG_PTR1_FREE)
-    {
-      req->flags &= ~EIO_FLAG_PTR1_FREE;
-      free (req->ptr1);
-      req->ptr1 = NULL;
-    }
-
-  if (!dirp)
-    {
-      req->errorno = errno;
-      return;
-    }
+    free (req->ptr1);
 
   req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
   req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;

diff --git a/deps/uv/src/unix/fs.c b/deps/uv/src/unix/fs.c
@@ -55,8 +55,8 @@
     req->result = func(args); \
     if (req->result) { \
       uv_err_new(loop, errno); \
-      return -1; \
     }  \
+    return req->result; \
   } \
   return 0;
 
@@ -116,15 +116,16 @@ static int uv__fs_after(eio_req* eio) {
 
   switch (req->fs_type) {
     case UV_FS_READDIR:
+      if (req->eio->result == -1)
+        break; /* opendir() or readdir() operation failed. */
+
       /*
        * XXX This is pretty bad.
        * We alloc and copy the large null terminated string list from libeio.
        * This is done because libeio is going to free eio->ptr2 after this
        * callback. We must keep it until uv_fs_req_cleanup. If we get rid of
        * libeio this can be avoided.
        */
-      if (req->eio->ptr2 == NULL)
-        break;
       buflen = 0;
       name = req->eio->ptr2;
       for (i = 0; i < req->result; i++) {
@@ -203,6 +204,8 @@ int uv_fs_open(uv_loop_t* loop, uv_fs_t* req, const char* path, int flags,
     }
 
     uv__cloexec(req->result, 1);
+
+    return req->result;
   }
 
   return 0;
@@ -234,6 +237,8 @@ int uv_fs_read(uv_loop_t* loop, uv_fs_t* req, uv_file fd, void* buf,
       uv_err_new(loop, errno);
       return -1;
     }
+
+    return req->result;
   }
 
   return 0;
@@ -269,6 +274,8 @@ int uv_fs_write(uv_loop_t* loop, uv_fs_t* req, uv_file file, void* buf,
       uv_err_new(loop, errno);
       return -1;
     }
+
+    return req->result;
   }
 
   return 0;
@@ -341,6 +348,8 @@ int uv_fs_readdir(uv_loop_t* loop, uv_fs_t* req, const char* path, int flags,
       req->result = -1;
       return -1;
     }
+
+    return req->result;
   }
 
   return 0;
@@ -387,6 +396,7 @@ int uv_fs_stat(uv_loop_t* loop, uv_fs_t* req, const char* path, uv_fs_cb cb) {
     }
 
     req->ptr = &req->statbuf;
+    return req->result;
   }
 
   return 0;
@@ -416,6 +426,7 @@ int uv_fs_fstat(uv_loop_t* loop, uv_fs_t* req, uv_file file, uv_fs_cb cb) {
     }
 
     req->ptr = &req->statbuf;
+    return req->result;
   }
 
   return 0;
@@ -546,6 +557,7 @@ int uv_fs_lstat(uv_loop_t* loop, uv_fs_t* req, const char* path, uv_fs_cb cb) {
     }
 
     req->ptr = &req->statbuf;
+    return req->result;
   }
 
   return 0;
@@ -611,7 +623,7 @@ int uv_fs_readlink(uv_loop_t* loop, uv_fs_t* req, const char* path,
       req->ptr = buf;
     }
 
-    return 0;
+    return req->result;
   }
 
   assert(0 && "unreachable");