Ajout de format_caml_exception

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

1 files changed, 19 insertions, 8 deletions

diff --git a/byterun/printexc.c b/byterun/printexc.c
index 19c4e6bbf..128f4d296 100644
--- a/byterun/printexc.c
+++ b/byterun/printexc.c
@@ -42,18 +42,13 @@ static void add_string(struct stringbuf *buf, char *s)
   buf->ptr += len;
 }
   
-#ifdef HAS_UI
-#define errprintf(fmt,arg) ui_print_stderr(fmt, arg)
-#else
-#define errprintf(fmt,arg) fprintf(stderr, fmt, arg)
-#endif
-
-void fatal_uncaught_exception(value exn)
+char * format_caml_exception(value exn)
 {
   mlsize_t start, i;
   value bucket, v;
   struct stringbuf buf;
   char intbuf[64];
+  char * res;
 
   buf.ptr = buf.data;
   buf.end = buf.data + sizeof(buf.data) - 1;
@@ -87,7 +82,23 @@ void fatal_uncaught_exception(value exn)
     add_char(&buf, ')');
   }
   *buf.ptr = 0;              /* Terminate string */
-  errprintf("Fatal error: uncaught exception %s\n", buf.data);
+  i = buf.ptr - buf.data + 1;
+  res = malloc(i);
+  if (res == NULL) return NULL;
+  bcopy(buf.data, res, i);
+  return res;
+}
+
+
+void fatal_uncaught_exception(value exn)
+{
+  char * msg = format_caml_exception(exn);
+#ifdef HAS_UI
+  ui_print_stderr("Fatal error: uncaught exception %s\n", msg);
+#else
+  fprintf(stderr, "Fatal error: uncaught exception %s\n", msg);
+#endif
+  free(msg);
 #ifdef HAS_UI
   ui_exit(2);
 #else