From 3a023e980e91286ad90663e400b512eda65a510d Mon Sep 17 00:00:00 2001
From: "Michael D. Lowis" <mike@mdlowis.com>
Date: Fri, 18 Sep 2015 20:29:42 -0400
Subject: [PATCH] Removed exits functionality and changed formatting for rune
 type files

---
 source/exits.c   | 15 ---------------
 source/libc.h    |  8 +-------
 source/main.c    |  7 ++-----
 tools/unicode.rb |  2 +-
 4 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 source/exits.c

diff --git a/source/exits.c b/source/exits.c
deleted file mode 100644
index f4d461f..0000000
--- a/source/exits.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "libc.h"
-
-char* errstr = nil;
-
-static int exitcode(void)
-{
-    return errstr ? 1 : errno;
-}
-
-void exits(char* estr)
-{
-    errstr = estr;
-    exit(exitcode());
-}
-
diff --git a/source/libc.h b/source/libc.h
index cac2cb2..adf55d4 100644
--- a/source/libc.h
+++ b/source/libc.h
@@ -446,18 +446,12 @@ int iovprint(iobuf*, char*, va_list);
     #endif
 #endif
 
-/*
- * New Features
- */
-extern char* errstr;
-void exits(char* str);
-
 /*
  * Make sure we use the built-in main which calls user_main
  */
 #ifndef NO_MAIN_WRAPPER
     #define main user_main
 #endif
-void user_main(int, char**);
+int user_main(int, char**);
 
 #endif /* LIBC_H */
diff --git a/source/main.c b/source/main.c
index 8b70bcc..bf53ea5 100644
--- a/source/main.c
+++ b/source/main.c
@@ -1,10 +1,7 @@
 #define NO_MAIN_WRAPPER
 #include "libc.h"
 
-int main(int argc, char** argv)
-{
-    user_main(argc, argv);
-    exits(errstr);
-    return -1;
+int main(int argc, char** argv) {
+    return user_main(argc, argv);
 }
 
diff --git a/tools/unicode.rb b/tools/unicode.rb
index fd08636..a632b61 100755
--- a/tools/unicode.rb
+++ b/tools/unicode.rb
@@ -93,7 +93,7 @@ def get_ranges(table)
 end
 
 def generate_typecheck_func(type, count)
-    "extern int runeinrange(const void* a, const void* b);\n" +
+    "extern int runeinrange(const void* a, const void* b);\n\n" +
     "bool is#{type.to_s.gsub(/s$/,'')}rune(Rune ch) {\n" +
     "    return (NULL != bsearch(&ch, #{type}, #{count}, 2 * sizeof(Rune), &runeinrange));\n" +
     "}\n"
-- 
2.55.0