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/chmod.c b/otherlibs/unix/chmod.c
index ed2e88c8d7..a042155211 100644
--- a/otherlibs/unix/chmod.c
+++ b/otherlibs/unix/chmod.c
@@ -14,12 +14,20 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <mlvalues.h>
+#include <memory.h>
+#include <signals.h>
 #include "unixsupport.h"
 
 CAMLprim value unix_chmod(value path, value perm)
 {
+  CAMLparam2(path, perm);
+  char * p;
   int ret;
-  ret = chmod(String_val(path), Int_val(perm));
+  p = caml_stat_alloc_string(path);
+  caml_enter_blocking_section();
+  ret = chmod(p, Int_val(perm));
+  caml_leave_blocking_section();
+  caml_stat_free(p);
   if (ret == -1) uerror("chmod", path);
-  return Val_unit;
+  CAMLreturn(Val_unit);
 }