From 1df9b19429212012b245a88b08ab37caef564d1c Mon Sep 17 00:00:00 2001
From: Steve Bennett <steveb@workware.net.au>
Date: Sun, 24 Jan 2010 10:26:24 +1000
Subject: Implement some new features

Implement 'lreplace'
Implement 'string last'
Implement 'pid'
Implement 'info procs'
Implement 'info script'
Implement 'info patchlevel' as an alias for 'info version'
Implement syslog extensions for jim
Fix return code display in jim-interactive.c
Make jim more compatible if JIM_TCL_COMPAT is set
*: Use tcl_interactive rather than jim_interactive
*: Use auto_path rather than jim_libpath
Add "." to the lib search path, not "./"
Fix a couple of files with CRLF line endings
---
 jimsh.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'jimsh.c')

diff --git a/jimsh.c b/jimsh.c
index 67a4119..464f943 100644
--- a/jimsh.c
+++ b/jimsh.c
@@ -137,11 +137,11 @@ int main(int argc, char *const argv[])
 
     /* Append the path where the executed Jim binary is contained
      * in the jim_libpath list. */
-    listObj = Jim_GetVariableStr(interp, "jim_libpath", JIM_NONE);
+    listObj = Jim_GetVariableStr(interp, JIM_LIBPATH, JIM_NONE);
     if (Jim_IsShared(listObj))
         listObj = Jim_DuplicateObj(interp, listObj);
     Jim_ListAppendElement(interp, listObj, JimGetExePath(interp, argv[0]));
-    Jim_SetVariableStr(interp, "jim_libpath", listObj);
+    Jim_SetVariableStr(interp, JIM_LIBPATH, listObj);
 
     /* Populate argv and argv0 global vars */
     listObj = Jim_NewListObj(interp, NULL, 0);
@@ -153,12 +153,12 @@ int main(int argc, char *const argv[])
     Jim_SetVariableStr(interp, "argv", listObj);
     
     if (argc == 1) {
-        Jim_SetVariableStrWithStr(interp, "jim_interactive", "1");
+        Jim_SetVariableStrWithStr(interp, JIM_INTERACTIVE, "1");
         JimLoadJimRc(interp);
         retcode = Jim_InteractivePrompt(interp);
     } else {
         Jim_SetVariableStr(interp, "argv0", Jim_NewStringObj(interp, argv[1], -1));
-        Jim_SetVariableStrWithStr(interp, "jim_interactive", "0");
+        Jim_SetVariableStrWithStr(interp, JIM_INTERACTIVE, "0");
         if ((retcode = Jim_EvalFile(interp, argv[1])) == JIM_ERR) {
             Jim_PrintErrorMessage(interp);
         }
-- 
cgit v1.1