From e8bfa491fa726c034a99ff7fc4fc64b990d45e12 Mon Sep 17 00:00:00 2001
From: Steve Bennett <steveb@workware.net.au>
Date: Tue, 28 Sep 2010 08:13:31 +1000
Subject: Allow exit from .jimrc

Only show error on JIM_ERR from .jimrc
Also fixes to rlprompt.tcl so it can be used from .jimrc

Signed-off-by: Steve Bennett <steveb@workware.net.au>
---
 jimsh.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'jimsh.c')

diff --git a/jimsh.c b/jimsh.c
index 73763b8..32f16b7 100644
--- a/jimsh.c
+++ b/jimsh.c
@@ -92,7 +92,7 @@ static Jim_Obj *JimGetExePath(Jim_Interp *interp, const char *argv0)
 }
 #endif /* JIM_ANSIC */
 
-static void JimLoadJimRc(Jim_Interp *interp)
+static int JimLoadJimRc(Jim_Interp *interp)
 {
     const char *home;
     /* XXX: Move off stack */
@@ -100,21 +100,24 @@ static void JimLoadJimRc(Jim_Interp *interp)
     const char *names[] = { ".jimrc", "jimrc.tcl", NULL };
     int i;
     FILE *fp;
+    int retcode;
 
     if ((home = getenv("HOME")) == NULL)
-        return;
+        return JIM_OK;
     for (i = 0; names[i] != NULL; i++) {
         if (strlen(home) + strlen(names[i]) + 1 > JIM_PATH_LEN)
             continue;
         sprintf(buf, "%s/%s", home, names[i]);
         if ((fp = fopen(buf, "r")) != NULL) {
             fclose(fp);
-            if (Jim_EvalFile(interp, buf) != JIM_OK) {
+            retcode = Jim_EvalFile(interp, buf);
+            if (retcode == JIM_ERR) {
                 Jim_PrintErrorMessage(interp);
             }
-            return;
+            return retcode;
         }
     }
+    return JIM_OK;
 }
 
 static void JimSetArgv(Jim_Interp *interp, int argc, char *const argv[])
@@ -160,8 +163,10 @@ int main(int argc, char *const argv[])
     if (argc == 1) {
         Jim_SetVariableStrWithStr(interp, JIM_INTERACTIVE, "1");
         JimSetArgv(interp, 0, NULL);
-        JimLoadJimRc(interp);
-        retcode = Jim_InteractivePrompt(interp);
+        retcode = JimLoadJimRc(interp);
+        if (retcode != JIM_EXIT) {
+            retcode = Jim_InteractivePrompt(interp);
+        }
     }
     else {
         Jim_SetVariableStrWithStr(interp, JIM_INTERACTIVE, "0");
-- 
cgit v1.1