From ef6f9168c41cf0764434def513fcc366a3e180f3 Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Mon, 7 Nov 1988 10:25:45 +0000
Subject: [PATCH] do not refer to _exit. For some machines, it does not exist

---
 lang/m2/libm2/catch.c | 2 +-
 lang/m2/libm2/halt.c  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lang/m2/libm2/catch.c b/lang/m2/libm2/catch.c
index 5768cb4b5..15a6b75e0 100644
--- a/lang/m2/libm2/catch.c
+++ b/lang/m2/libm2/catch.c
@@ -93,7 +93,7 @@ catch(trapno)
 		signal(__signo, SIG_DFL);
 		_cleanup();
 		kill(getpid(), __signo);
-		_exit(trapno);
+		exit(trapno);
 	}
 #endif
 #endif
diff --git a/lang/m2/libm2/halt.c b/lang/m2/libm2/halt.c
index feb4b34ba..e32e8900f 100644
--- a/lang/m2/libm2/halt.c
+++ b/lang/m2/libm2/halt.c
@@ -20,6 +20,7 @@ _cleanup()
 	for (i = 0; i < callindex; i++) {
 		(*proclist[i])();
 	}
+	callindex = 0;
 }
 
 CallAtEnd(p)