flambda-backend: Use upstream implementation of caml_unix_error_messa…

…ge for runtime5 (#2111)
ocaml-flambda · Dec 4, 2023 · a998ddf · a998ddf
1 parent 6fafc58
commit a998ddf
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/otherlibs/unix/errmsg_unix.c b/otherlibs/unix/errmsg_unix.c
@@ -21,6 +21,17 @@
 #include <caml/sys.h>
 #include "unixsupport.h"
 
+#ifdef CAML_RUNTIME_5
+
+CAMLprim value caml_unix_error_message(value err)
+{
+  char buf[1024];
+  int errnum = caml_unix_code_of_unix_error(err);
+  return caml_copy_string(caml_strerror(errnum, buf, sizeof(buf)));
+}
+
+#else
+
 CAMLprim value caml_unix_error_message(value err)
 {
   char buf[1024];
@@ -32,3 +43,5 @@ CAMLprim value caml_unix_error_message(value err)
     */
     buf);
 }
+
+#endif
diff --git a/runtime4/caml/sys.h b/runtime4/caml/sys.h
@@ -24,6 +24,8 @@
 extern "C" {
 #endif
 
+CAMLextern char * caml_strerror(int errnum, char * buf, size_t buflen);
+
 #define NO_ARG Val_int(0)
 
 CAMLnoreturn_start

diff --git a/runtime4/sys.c b/runtime4/sys.c
@@ -61,6 +61,23 @@
 #include "caml/callback.h"
 #include "caml/startup_aux.h"
 
+CAMLexport char * caml_strerror(int errnum, char * buf, size_t buflen)
+{
+#ifdef _WIN32
+  /* Windows has a thread-safe strerror */
+  return strerror(errnum);
+#else
+  int res = strerror_r(errnum, buf, buflen);
+  /* glibc<2.13 returns -1/sets errno, >2.13 returns +ve errno.
+     We assume that buffer size is large enough not to get ERANGE,
+     so we assume we got EINVAL. */
+  if (res != 0) {
+    snprintf(buf, buflen, "Unknown error %d", errnum);
+  }
+  return buf;
+#endif
+}
+
 static char * error_message(void)
 {
   return strerror(errno);