Port fatal_error

Author: CraftSpider

crates/engine_xetex/src/c_api/errors.rs

@@ -3,8 +3,8 @@ use crate::c_api::engine::{
 };
 use crate::c_api::globals::Globals;
 use crate::c_api::output::{
-    rs_capture_to_diagnostic, rs_error_here_with_diagnostic, rs_print_char, rs_print_ln,
-    rs_print_nl_bytes,
+    rs_capture_to_diagnostic, rs_error_here_with_diagnostic, rs_print_bytes, rs_print_char,
+    rs_print_ln, rs_print_nl_bytes,
 };
 use std::ffi::CStr;
 
@@ -141,6 +141,27 @@ extern "C" fn post_error_message(need_to_print_it: i32) {
     });
 }
 
+#[no_mangle]
+pub extern "C" fn fatal_error(s: *const libc::c_char) {
+    let s = unsafe { CStr::from_ptr(s) }.to_bytes();
+    Globals::with(|globals| {
+        rs_pre_error_message(globals);
+        rs_print_bytes(globals, b"Emergency stop");
+        rs_print_nl_bytes(globals, s);
+        rs_capture_to_diagnostic(globals, None);
+    });
+
+    unsafe { close_files_and_terminate() };
+    unsafe { tt_cleanup() };
+
+    Globals::with(|globals| {
+        globals
+            .out
+            .rust_stdout
+            .map(|stdout| globals.state.output_flush(stdout))
+    });
+}
+
 // TODO: Use the Rust versions directly once they're ported. These just rely indirectly on this
 //       function, making it easier to port piecemeal.
 extern "C" {

crates/engine_xetex/xetex/xetex-errors.c

@@ -11,21 +11,6 @@
 
 /* WEBby error-handling code: */
 
-void
-fatal_error(const char* s)
-{
-    pre_error_message();
-    print_cstr("Emergency stop");
-    print_nl_cstr(s);
-    capture_to_diagnostic(NULL); // started in pre_error_message
-
-    close_files_and_terminate();
-    tt_cleanup();
-    ttstub_output_flush(rust_stdout());
-    _tt_abort("%s", s);
-}
-
-
 void
 overflow(const char* s, int32_t n)
 {

crates/engine_xetex/xetex/xetex_bindings.h

@@ -764,6 +764,8 @@ void error(void);
 
 void post_error_message(int32_t need_to_print_it);
 
+void fatal_error(void);
+
 extern void close_files_and_terminate(void);
 
 extern void tt_cleanup(void);