From f322bbe729febeccec34ef0146831be1a1d29533 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Sun, 18 Dec 2011 22:28:30 +0100
Subject: [PATCH] uv: upgrade to feb267e

---
 deps/uv/include/uv.h  |  3 ++-
 deps/uv/src/unix/dl.c | 22 +++++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h
index e8b70b180..a20070875 100644
--- a/deps/uv/include/uv.h
+++ b/deps/uv/include/uv.h
@@ -1250,7 +1250,8 @@ UV_EXTERN uv_err_t uv_dlopen(const char* filename, uv_lib_t* library);
 UV_EXTERN uv_err_t uv_dlclose(uv_lib_t library);
 
 /*
- * Retrieves a data pointer from a dynamic library.
+ * Retrieves a data pointer from a dynamic library. It is legal for a symbol to
+ * map to NULL.
  */
 UV_EXTERN uv_err_t uv_dlsym(uv_lib_t library, const char* name, void** ptr);
 
diff --git a/deps/uv/src/unix/dl.c b/deps/uv/src/unix/dl.c
index 6c4ddff89..41c244d79 100644
--- a/deps/uv/src/unix/dl.c
+++ b/deps/uv/src/unix/dl.c
@@ -25,11 +25,17 @@
 #include <dlfcn.h>
 #include <errno.h>
 
+/* The dl family of functions don't set errno. We need a good way to communicate
+ * errors to the caller but there is only dlerror() and that returns a string -
+ * a string that may or may not be safe to keep a reference to...
+ */
+static const uv_err_t uv_inval_ = { UV_EINVAL, EINVAL };
+
 
 uv_err_t uv_dlopen(const char* filename, uv_lib_t* library) {
   void* handle = dlopen(filename, RTLD_LAZY);
   if (handle == NULL) {
-    return uv__new_sys_error(errno);
+    return uv_inval_;
   }
 
   *library = handle;
@@ -39,7 +45,7 @@ uv_err_t uv_dlopen(const char* filename, uv_lib_t* library) {
 
 uv_err_t uv_dlclose(uv_lib_t library) {
   if (dlclose(library) != 0) {
-    return uv__new_sys_error(errno);
+    return uv_inval_;
   }
 
   return uv_ok_;
@@ -47,9 +53,15 @@ uv_err_t uv_dlclose(uv_lib_t library) {
 
 
 uv_err_t uv_dlsym(uv_lib_t library, const char* name, void** ptr) {
-  void* address = dlsym(library, name);
-  if (address == NULL) {
-    return uv__new_sys_error(errno);
+  void* address;
+
+  /* Reset error status. */
+  dlerror();
+
+  address = dlsym(library, name);
+
+  if (dlerror()) {
+    return uv_inval_;
   }
 
   *ptr = (void*) address;