changeset 11837:e76649d19a1a release-3-0-x

octave.cc (octave_main): make all command-line arguments available to startup scripts
author John W. Eaton <jwe@octave.org>
date Mon, 15 Sep 2008 08:06:54 +0200
parents 7b8f1b431b03
children 8c69552f5906
files src/ChangeLog src/octave.cc
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue May 20 16:49:02 2008 -0400
+++ b/src/ChangeLog	Mon Sep 15 08:06:54 2008 +0200
@@ -1,3 +1,8 @@
+2008-09-10  John W. Eaton  <jwe@octave.org>
+
+	* octave.cc (octave_main): Make all command-line arguments
+	available to startup scripts and PKG_ADD files.
+
 2008-05-20  Kim Hansen  <kimhanse@gmail.com>
 
 	* load-path.cc (load_path::do_initialize):
--- a/src/octave.cc	Tue May 20 16:49:02 2008 -0400
+++ b/src/octave.cc	Mon Sep 15 08:06:54 2008 +0200
@@ -750,6 +750,11 @@
 
   initialize_version_info ();
 
+  // Make all command-line arguments available to startup files,
+  // including PKG_ADD files.
+
+  intern_argv (argc, argv);
+
   load_path::initialize (set_initial_path);
 
   execute_startup_files ();
@@ -778,10 +783,6 @@
 
   if (! code_to_eval.empty ())
     {
-      // We probably want all the args for an --eval option.
-
-      intern_argv (argc, argv);
-
       int parse_status = execute_eval_option_code (code_to_eval);
 
       if (! (persist || remaining_args > 0))