Merge branch 'master' into array-iface

1 files changed, 23 insertions, 10 deletions

diff --git a/msg.c b/msg.c
index dabd20e3..5427a963 100644
--- a/msg.c
+++ b/msg.c
@@ -33,13 +33,13 @@ static const char *srcfile = NULL;
 static int srcline;
 
 jmp_buf fatal_tag;
-int fatal_tag_valid = FALSE;
+bool fatal_tag_valid = false;
 
 /* err --- print an error message with source line and file and record */
 
 /* VARARGS2 */
 void
-err(const char *s, const char *emsg, va_list argp)
+err(bool isfatal, const char *s, const char *emsg, va_list argp)
 {
 	char *file;
 	const char *me;
@@ -89,6 +89,13 @@ err(const char *s, const char *emsg, va_list argp)
 	vfprintf(stderr, emsg, argp);
 	(void) fprintf(stderr, "\n");
 	(void) fflush(stderr);
+
+	if (isfatal) {
+#ifdef GAWKDEBUG
+		abort();
+#endif
+		gawk_exit(EXIT_FATAL);
+	}
 }
 
 /* msg --- take a varargs error message and print it */
@@ -98,7 +105,7 @@ msg(const char *mesg, ...)
 {
 	va_list args;
 	va_start(args, mesg);
-	err("", mesg, args);
+	err(false, "", mesg, args);
 	va_end(args);
 }
 
@@ -109,7 +116,7 @@ warning(const char *mesg, ...)
 {
 	va_list args;
 	va_start(args, mesg);
-	err(_("warning: "), mesg, args);
+	err(false, _("warning: "), mesg, args);
 	va_end(args);
 }
 
@@ -118,7 +125,7 @@ error(const char *mesg, ...)
 {
 	va_list args;
 	va_start(args, mesg);
-	err(_("error: "), mesg, args);
+	err(false, _("error: "), mesg, args);
 	va_end(args);
 }
 
@@ -141,12 +148,8 @@ r_fatal(const char *mesg, ...)
 {
 	va_list args;
 	va_start(args, mesg);
-	err(_("fatal: "), mesg, args);
+	err(true, _("fatal: "), mesg, args);
 	va_end(args);
-#ifdef GAWKDEBUG
-	abort();
-#endif
-	gawk_exit(EXIT_FATAL);
 }
 
 /* gawk_exit --- longjmp out if necessary */
@@ -160,6 +163,16 @@ gawk_exit(int status)
 	}
 
 	/* we could close_io() here */
+	final_exit(status);
+}
+
+/* final_exit --- run extension exit handlers and exit */
+
+void
+final_exit(int status)
+{
+	/* run any extension exit handlers */
+	run_ext_exit_handlers(status);
 	close_extensions();
 
 	exit(status);