merge with trunk at rev 14512ephemeron

git-svn-id: http://caml.inria.fr/svn/ocaml/branches/ephemeron@14514 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 10 insertions, 2 deletions

diff --git a/otherlibs/unix/access.c b/otherlibs/unix/access.c
index 3a612a3406..9af8a6f959 100644
--- a/otherlibs/unix/access.c
+++ b/otherlibs/unix/access.c
@@ -13,6 +13,8 @@
 
 #include <mlvalues.h>
 #include <alloc.h>
+#include <memory.h>
+#include <signals.h>
 #include "unixsupport.h"
 
 #ifdef HAS_UNISTD
@@ -40,11 +42,17 @@ static int access_permission_table[] = {
 
 CAMLprim value unix_access(value path, value perms)
 {
+  CAMLparam2(path, perms);
+  char * p;
   int ret, cv_flags;
 
   cv_flags = convert_flag_list(perms, access_permission_table);
-  ret = access(String_val(path), cv_flags);
+  p = caml_stat_alloc_string(path);
+  caml_enter_blocking_section();
+  ret = access(p, cv_flags);
+  caml_leave_blocking_section();
+  caml_stat_free(p);
   if (ret == -1)
     uerror("access", path);
-  return Val_unit;
+  CAMLreturn(Val_unit);
 }