From 12d3283c5d0b296e70b3797bd3cb8f644b2ee342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Thu, 26 Sep 1996 18:45:03 +0200
Subject: [PATCH] better error messages..
Rev: src/builtin_functions.c:1.5
Rev: src/error.c:1.2
Rev: src/main.c:1.4
---
src/builtin_functions.c | 2 ++
src/error.c | 2 +-
src/main.c | 1 -
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/builtin_functions.c b/src/builtin_functions.c
index 9820f6bbd8..f422cf214c 100644
--- a/src/builtin_functions.c
+++ b/src/builtin_functions.c
@@ -623,6 +623,8 @@ void f_exit(INT32 args)
if(sp[-args].type != T_INT)
error("Bad argument 1 to exit.\n");
+ exit_on_error="Pike is exiting: ";
+
call_callback(&exit_callbacks, (void *)0);
free_callback(&exit_callbacks);
diff --git a/src/error.c b/src/error.c
index c09e5b30da..1770453aa3 100644
--- a/src/error.c
+++ b/src/error.c
@@ -88,7 +88,7 @@ void va_error(char *fmt, va_list args)
abort();
}
- if(exit_on_error && !recoveries)
+ if(exit_on_error || !recoveries)
{
if(!exit_on_error)
exit_on_error="No error recovery context: ";
diff --git a/src/main.c b/src/main.c
index 34bbe127fd..9834a4ad67 100644
--- a/src/main.c
+++ b/src/main.c
@@ -264,7 +264,6 @@ void exit_main()
void cleanup_pike_types();
void cleanup_program();
- exit_on_error="Pike is exiting: ";
cleanup_objects();
exit_signals();
exit_lex();
--
GitLab