Merge pull request #116 from eclecticdave/master

exit() throws uncaught exception

1 files changed, 11 insertions, 1 deletions

diff --git a/src/postamble.js b/src/postamble.js
index c8fd44bd..51ffc6ee 100644
--- a/src/postamble.js
+++ b/src/postamble.js
@@ -17,7 +17,14 @@ Module.callMain = function callMain(args) {
   argv.push(0);
   argv = allocate(argv, 'i32', ALLOC_STATIC);
 
+#if CATCH_EXIT_CODE
+  try {
+    return _main(argc, argv, 0);
+  }
+  catch(e) { if (e.name == "ExitStatus") return e.status; throw e; }
+#else
   return _main(argc, argv, 0);
+#endif
 }
 
 {{GLOBAL_VARS}}
@@ -49,7 +56,10 @@ Module['noInitialRun'] = true;
 #endif
 
 if (!Module['noInitialRun']) {
-  run();
+  var ret = run();
+#if CATCH_EXIT_CODE
+  print('Exit Status: ' + ret);
+#endif
 }
 
 // {{POST_RUN_ADDITIONS}}