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, 24 insertions, 5 deletions

diff --git a/otherlibs/unix/truncate.c b/otherlibs/unix/truncate.c
index 638ef79947..c5b3a11591 100644
--- a/otherlibs/unix/truncate.c
+++ b/otherlibs/unix/truncate.c
@@ -13,7 +13,9 @@
 
 #include <sys/types.h>
 #include <mlvalues.h>
+#include <memory.h>
 #include <fail.h>
+#include <signals.h>
 #include <io.h>
 #include "unixsupport.h"
 #ifdef HAS_UNISTD
@@ -24,16 +26,33 @@
 
 CAMLprim value unix_truncate(value path, value len)
 {
-  if (truncate(String_val(path), Long_val(len)) == -1)
+  CAMLparam2(path, len);
+  char * p;
+  int ret;
+  p = caml_stat_alloc_string(path);
+  caml_enter_blocking_section();
+  ret = truncate(p, Long_val(len));
+  caml_leave_blocking_section();
+  caml_stat_free(p);
+  if (ret == -1)
     uerror("truncate", path);
-  return Val_unit;
+  CAMLreturn(Val_unit);
 }
 
-CAMLprim value unix_truncate_64(value path, value len)
+CAMLprim value unix_truncate_64(value path, value vlen)
 {
-  if (truncate(String_val(path), File_offset_val(len)) == -1)
+  CAMLparam2(path, vlen);
+  char * p;
+  int ret;
+  file_offset len = File_offset_val(vlen);
+  p = caml_stat_alloc_string(path);
+  caml_enter_blocking_section();
+  ret = truncate(p, len);
+  caml_leave_blocking_section();
+  caml_stat_free(p);
+  if (ret == -1)
     uerror("truncate", path);
-  return Val_unit;
+  CAMLreturn(Val_unit);
 }
 
 #else