From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tom Tromey <tromey@redhat.com>
To: Keith Seitz <keiths@cygnus.com>
Cc: Insight List <insight@sourceware.cygnus.com>
Subject: Re: Startup with --args
Date: Wed, 21 Nov 2001 23:18:00 -0000
Message-ID: <48256B0B.007F2781.00@TWALINS3>
X-SW-Source: 2001-q4/msg00357.html
Message-ID: <20011121231800.vv5XmeWRNwvygkwInER8WSuHbAyj7TYo-8lSivtiw74@z>

>>>>> "Keith" == Keith Seitz <keiths@cygnus.com> writes:

>> I've been running with my --args patch installed for a while now.
>> Hopefully it will get its final approval soon.

Keith> Are you waiting on me for something?

Nope.  I think (but I still have to check) that I got the last
approval for that patch from Elena today.

Keith> Is there a way to do this without modifying
Keith> session_notice_file_change? I don't know. It seems to me that
Keith> if we want to override the session's arguments, we should just
Keith> do that.

It never occurred to me.  Unbelievable.  How about the appended?  It
is much simpler.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>

     * library/interface.tcl (gdbtk_tcl_preloop): Override session's
     command-line arguments if required.

Index: library/interface.tcl
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/library/interface.tcl,v
retrieving revision 1.32
diff -u -r1.32 interface.tcl
--- library/interface.tcl 2001/11/19 18:43:19 1.32
+++ library/interface.tcl 2001/11/21 22:36:53
@@ -113,8 +113,14 @@

   if {$gdb_exe_name != ""} {
     # At startup, file_changed_hook is called too late for us, so we
-    # must notice the initial session by hand.
+    # must notice the initial session by hand.  If the arguments exist
+    # -- if the user used `gdb --args' -- then we want the new
+    # arguments to override the session's arguments.
+    set current_args [gdb_get_inferior_args]
     session_notice_file_change
+    if {[string length $current_args] > 0} {
+      gdb_set_inferior_args $current_args
+    }
   }

   gdbtk_update