* jimsh.c: $argv0 should be the name of the script

2 files changed, 3 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 44d1a23..b9edd38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2009-08-16 Steve Bennett <steveb@workware.net.au>
 	
+	* jimsh.c: $argv0 should be the name of the script
 	* jim.c: Should be able to compare strings for order in expr
 	* jim.c:  'unset ::var' to unset a global var.
  	It was doing nothing.
diff --git a/jimsh.c b/jimsh.c
index 862617c..d68098c 100644
--- a/jimsh.c
+++ b/jimsh.c
@@ -1,5 +1,6 @@
 /* Jimsh - An interactive shell for Jim
  * Copyright 2005 Salvatore Sanfilippo <antirez@invece.org>
+ * Copyright 2009 Steve Bennett <steveb@workware.net.au>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -146,7 +147,6 @@ int main(int argc, char *const argv[])
         Jim_ListAppendElement(interp, listObj, obj);
     }
 
-    Jim_SetVariableStr(interp, "argv0", Jim_NewStringObj(interp, argv[0], -1));
     Jim_SetVariableStr(interp, "argv", listObj);
     
     if (argc == 1) {
@@ -154,6 +154,7 @@ int main(int argc, char *const argv[])
         JimLoadJimRc(interp);
         retcode = Jim_InteractivePrompt(interp);
     } else {
+        Jim_SetVariableStr(interp, "argv0", Jim_NewStringObj(interp, argv[1], -1));
         Jim_SetVariableStrWithStr(interp, "jim_interactive", "0");
         if ((retcode = Jim_EvalFile(interp, argv[1])) == JIM_ERR) {
             Jim_PrintErrorMessage(interp);