From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2352 invoked by alias); 16 Nov 2005 16:34:09 -0000 Received: (qmail 2290 invoked by uid 22791); 16 Nov 2005 16:34:01 -0000 Received: from lon-del-02.spheriq.net (HELO lon-del-02.spheriq.net) (195.46.50.98) by sourceware.org (qpsmtpd/0.30-dev) with ESMTP; Wed, 16 Nov 2005 16:34:01 +0000 Received: from lon-out-02.spheriq.net ([195.46.50.130]) by lon-del-02.spheriq.net with ESMTP id jAGGXwlS023005 for ; Wed, 16 Nov 2005 16:33:58 GMT Received: from lon-cus-01.spheriq.net (lon-cus-01.spheriq.net [195.46.50.37]) by lon-out-02.spheriq.net with ESMTP id jAGGXvF9031306 for ; Wed, 16 Nov 2005 16:33:57 GMT Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by lon-cus-01.spheriq.net with ESMTP id jAGGXthU021953 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=OK) for ; Wed, 16 Nov 2005 16:33:55 GMT Received: from zeta.dmz-eu.st.com (ns2.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 0DCA8DA47 for ; Wed, 16 Nov 2005 16:33:51 +0000 (GMT) Received: by zeta.dmz-eu.st.com (STMicroelectronics, from userid 60012) id C889F4747A; Wed, 16 Nov 2005 16:36:49 +0000 (GMT) Received: from zeta.dmz-eu.st.com (localhost [127.0.0.1]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 9014175994 for ; Wed, 16 Nov 2005 16:36:49 +0000 (UTC) Received: from mail1.bri.st.com (mail1.bri.st.com [164.129.8.218]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 0033847586 for ; Wed, 16 Nov 2005 16:36:48 +0000 (GMT) Received: from [164.129.15.13] (terrorhawk.bri.st.com [164.129.15.13]) by mail1.bri.st.com (MOS 3.5.8-GR) with ESMTP id CGZ38748 (AUTH "andrew stubbs"); Wed, 16 Nov 2005 16:33:49 GMT Message-ID: <437B5ED3.70805@st.com> Date: Wed, 16 Nov 2005 17:34:00 -0000 From: Andrew STUBBS User-Agent: Mozilla Thunderbird 1.0.2 (Windows/20050317) MIME-Version: 1.0 To: gdb-patches@sources.redhat.com Subject: [PATCH] -nx-except-gdbtkinit option Content-Type: multipart/mixed; boundary="------------040707080909080907070501" X-O-Spoofed: Not Scanned X-O-General-Status: No X-O-Spam1-Status: Not Scanned X-O-Spam2-Status: Not Scanned X-O-URL-Status: Not Scanned X-O-Virus1-Status: No X-O-Virus2-Status: Not Scanned X-O-Virus3-Status: No X-O-Virus4-Status: No X-O-Virus5-Status: Not Scanned X-O-Image-Status: Not Scanned X-O-Attach-Status: Not Scanned X-SpheriQ-Ver: 4.1.07 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2005-11/txt/msg00237.txt.bz2 This is a multi-part message in MIME format. --------------040707080909080907070501 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 443 Hi, The attached patch adds a new option named '-nx-except-gdbtkinit'. Not exactly a snappy name, but it does what it says on the tin and I only intend it for use with a wrapper script we use. I can add a shorter name if required. The -nx option disables .gdbinit but also disables .gdbtkinit, which is not what I desire. The -nx-except-gdbtkinit does the same as -nx, but without affecting the configuration of Insight. Andrew Stubbs --------------040707080909080907070501 Content-Type: text/plain; name="nx-except-gdbtkinit.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="nx-except-gdbtkinit.patch" Content-length: 3491 2005-11-16 Andrew Stubbs * main.c (captured_main): Add option -nx-except-gdbtkinit and adjust -nx to support it. (print_gdb_help): Add --nx-except-gdbtkinit. * top.c (inhibit_gdbtkinit): New variable. * top.h (inhibit_gdbtkinit): New variable. gdbtk/ * generic/gdbtk.c (gdbtk_init): Change inhibit_gdbinit to inhibit_gdbtkinit. Index: src/gdb/main.c =================================================================== --- src.orig/gdb/main.c 2005-11-08 12:39:37.000000000 +0000 +++ src/gdb/main.c 2005-11-08 14:16:37.000000000 +0000 @@ -267,8 +267,8 @@ captured_main (void *data) {"quiet", no_argument, &quiet, 1}, {"q", no_argument, &quiet, 1}, {"silent", no_argument, &quiet, 1}, - {"nx", no_argument, &inhibit_gdbinit, 1}, - {"n", no_argument, &inhibit_gdbinit, 1}, + {"nx", no_argument, 0, 'n'}, + {"n", no_argument, 0, 'n'}, {"batch-silent", no_argument, 0, 'B'}, {"batch", no_argument, &batch, 1}, {"epoch", no_argument, &epoch_interface, 1}, @@ -296,6 +296,7 @@ captured_main (void *data) {"x", required_argument, 0, 'x'}, {"ex", required_argument, 0, 'X'}, #ifdef GDBTK + {"nx-except-gdbtkinit", no_argument, &inhibit_gdbinit, 1}, {"tclcommand", required_argument, 0, 'z'}, {"enable-external-editor", no_argument, 0, 'y'}, {"editor-command", required_argument, 0, 'w'}, @@ -418,6 +419,10 @@ captured_main (void *data) batch = batch_silent = 1; gdb_stdout = ui_file_new(); break; + case 'n': + inhibit_gdbinit = 1; + inhibit_gdbtkinit = 1; + break; #ifdef GDBTK case 'z': { @@ -896,6 +901,8 @@ Options:\n\n\ --nx Do not read "), stream); fputs_unfiltered (gdbinit, stream); fputs_unfiltered (_(" file.\n\ + --nx-except-gdbtkinit\n\ + As for --nx, but do read gdbtkinit for insight.\n\ --quiet Do not print version number on startup.\n\ --readnow Fully read symbol files on first access.\n\ "), stream); Index: src/gdb/top.c =================================================================== --- src.orig/gdb/top.c 2005-11-08 12:39:37.000000000 +0000 +++ src/gdb/top.c 2005-11-08 14:16:37.000000000 +0000 @@ -86,6 +86,7 @@ char gdbinit[PATH_MAX + 1] = GDBINIT_FILENAME; int inhibit_gdbinit = 0; +int inhibit_gdbtkinit = 0; /* If nonzero, and GDB has been configured to be able to use windows, attempt to open them upon startup. */ Index: src/gdb/top.h =================================================================== --- src.orig/gdb/top.h 2005-11-08 12:39:37.000000000 +0000 +++ src/gdb/top.h 2005-11-08 14:16:37.000000000 +0000 @@ -29,6 +29,7 @@ extern int linesize; extern FILE *instream; extern char gdb_dirbuf[1024]; extern int inhibit_gdbinit; +extern int inhibit_gdbtkinit; extern int epoch_interface; extern char gdbinit[]; Index: src/gdb/gdbtk/generic/gdbtk.c =================================================================== --- src.orig/gdb/gdbtk/generic/gdbtk.c 2005-11-08 12:39:37.000000000 +0000 +++ src/gdb/gdbtk/generic/gdbtk.c 2005-11-08 14:16:37.000000000 +0000 @@ -483,7 +483,7 @@ gdbtk_init (void) /* Set up some globals used by gdb to pass info to gdbtk for start up options and the like */ - xasprintf (&s, "%d", inhibit_gdbinit); + xasprintf (&s, "%d", inhibit_gdbtkinit); Tcl_SetVar2 (gdbtk_interp, "GDBStartup", "inhibit_prefs", s, TCL_GLOBAL_ONLY); free(s); --------------040707080909080907070501--