2009-08-16 Steve Bennett <steveb@workware.net.au>

	* jimsh.c: A script exiting with 'exit 0' would not give a return code of 0

2 files changed, 10 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index d9d7b4c..e89b906 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2009-08-16 Steve Bennett <steveb@workware.net.au>
 	
+	* jimsh.c: A script exiting with 'exit 0' would not give a return code of 0
 	* jim.c: Make [format %c 0] work (embedded nulls)
 	* jim-array-1.0.tcl: array unset was broken
 	* jim.c: Some recursion in unknown is OK, just not infinite recursion.
diff --git a/jimsh.c b/jimsh.c
index d68098c..518b53a 100644
--- a/jimsh.c
+++ b/jimsh.c
@@ -160,6 +160,15 @@ int main(int argc, char *const argv[])
             Jim_PrintErrorMessage(interp);
         }
     }
+    if (retcode == JIM_OK) {
+        retcode = 0;
+    }
+    else if (retcode == JIM_EXIT) {
+        retcode = interp->exitCode;
+    }
+    else {
+        retcode = 1;
+    }
     Jim_FreeInterp(interp);
     return retcode;
 }