haskal
/
utop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

exit with the right exit status 

With OCaml 4.12.0 and later, the toplevel use the Compenv.Exit_with_status
exception to communicate when and with which status we should exit.
This commit is contained in:
Florian Angeletti 2021-03-30 14:18:31 +02:00 committed by Perry E. Metzger
parent a5ff52bbf6
commit ac9c21cfcf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/uTop_main.ml
View File

@ -1572,6 +1572,7 @@ let main_aux ~initial_env =
exit 0 exit 0
let main_internal ~initial_env = let main_internal ~initial_env =
let exit_status = ref 2 in
try try
main_aux ~initial_env main_aux ~initial_env
with exn -> with exn ->
@ -1579,12 +1580,15 @@ let main_internal ~initial_env =
| Unix.Unix_error (error, func, "") -> | Unix.Unix_error (error, func, "") ->
Printf.eprintf "%s: %s: %s\n" app_name func (Unix.error_message error) Printf.eprintf "%s: %s: %s\n" app_name func (Unix.error_message error)
| Unix.Unix_error (error, func, arg) -> | Unix.Unix_error (error, func, arg) ->
Printf.eprintf "%s: %s(%S): %s\n" app_name func arg (Unix.error_message error) Printf.eprintf "%s: %s(%S): %s\n" app_name func arg (Unix.error_message error)
#if OCAML_VERSION >= (4,12,0)
| Compenv.Exit_with_status e -> exit_status := e
#endif
| exn -> | exn ->
Printf.eprintf "Fatal error: exception %s\n" (Printexc.to_string exn)); Printf.eprintf "Fatal error: exception %s\n" (Printexc.to_string exn));
Printexc.print_backtrace stderr; Printexc.print_backtrace stderr;
flush stderr; flush stderr;
exit 2 exit !exit_status
let main () = main_internal ~initial_env:None let main () = main_internal ~initial_env:None