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

Do not display a backtrace when exiting normally 

Exiting normally here refers to the `Exit_with_status` exception.
It is in particular triggered by `#quit;;` so we want to exit quietly
in that case.

Closes #398
This commit is contained in:
Etienne Millon 2022-09-15 15:56:40 +02:00 committed by Etienne Millon
parent c596ac7b88
commit 5aae06f007
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -3,6 +3,7 @@ Unreleased
* Bump the compatibility to 4.08+ (#393 @emillon)
* Load `@toplevel_printer` annotated printers for functors (#378 @metavinek)
* Do not display a backtrace when exiting normally (#399 #398 @emillon)
2.10.0 (2022-10-06)
------------------

9
src/lib/uTop_main.ml
View File

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