commit 558303076c494519a2d4a1212f0a60e011662f42
author Rob Landley <rob@landley.net> Sun Jun 16 19:59:51 2013 -0500
committer Rob Landley <rob@landley.net> Sun Jun 16 19:59:51 2013 -0500
tree 6b0440f7bbd7be9ef195794b95161aa71b88e62b
parent c2305e895d92412761d5be258c2b73064a7061ed

Add xexit() and make error_exit() use it.

lib/lib.c

diff --git a/lib/lib.c b/lib/lib.c
index af820e2..dca92cb 100644
--- a/lib/lib.c
+++ b/lib/lib.c
@@ -17,6 +17,12 @@
   strcpy(dest, src);
 }
 
+void xexit(void)
+{
+  if (toys.rebound) longjmp(*toys.rebound, 1);
+  else exit(toys.exitval);
+}
+
 void verror_msg(char *msg, int err, va_list va)
 {
   char *s = ": %s";
@@ -58,8 +64,7 @@
   verror_msg(msg, 0, va);
   va_end(va);
 
-  if (toys.rebound) longjmp(*toys.rebound, 1);
-  else exit(toys.exitval);
+  xexit();
 }
 
 
@@ -72,8 +77,7 @@
   verror_msg(msg, errno, va);
   va_end(va);
 
-  if (toys.rebound) longjmp(*toys.rebound, 1);
-  else exit(toys.exitval);
+  xexit();
 }
 
 // Die unless we can allocate memory.