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/chroot.c b/otherlibs/unix/chroot.c
index 02a46aedcf..7c9517c117 100644
--- a/otherlibs/unix/chroot.c
+++ b/otherlibs/unix/chroot.c
@@ -12,12 +12,20 @@
 /***********************************************************************/
 
 #include <mlvalues.h>
+#include <memory.h>
+#include <signals.h>
 #include "unixsupport.h"
 
 CAMLprim value unix_chroot(value path)
 {
+  CAMLparam1(path);
+  char * p;
   int ret;
-  ret = chroot(String_val(path));
+  p = caml_stat_alloc_string(path);
+  caml_enter_blocking_section();
+  ret = chroot(p);
+  caml_leave_blocking_section();
+  caml_stat_free(p);
   if (ret == -1) uerror("chroot", path);
-  return Val_unit;
+  CAMLreturn(Val_unit);
 }