From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21880 invoked by alias); 24 Nov 2001 18:23:01 -0000 Mailing-List: contact gdb-patches-help@sourceware.cygnus.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 21858 invoked from network); 24 Nov 2001 18:22:59 -0000 Received: from unknown (HELO lacrosse.corp.redhat.com) (207.175.42.154) by sourceware.cygnus.com with SMTP; 24 Nov 2001 18:22:59 -0000 Received: from trixie.bosbc.com (cgf.cipe.redhat.com [10.0.1.172]) by lacrosse.corp.redhat.com (8.11.6/8.9.3) with ESMTP id fAOIMvq03581 for ; Sat, 24 Nov 2001 13:22:57 -0500 Received: (from cgf@localhost) by trixie.bosbc.com (8.11.6/8.8.7) id fAOINHS24314 for gdb-patches@sources.redhat.com; Sat, 24 Nov 2001 13:23:17 -0500 Date: Sat, 10 Nov 2001 12:38:00 -0000 From: Christopher Faylor To: gdb-patches@sources.redhat.com Subject: [PATCH] Make cygwin use .gdbinit Message-ID: <20011124182316.GA24305@redhat.com> Mail-Followup-To: gdb-patches@sources.redhat.com Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.3.23.1i X-SW-Source: 2001-11/txt/msg00202.txt.bz2 I've changed the default initialization file for cygwin to '.gdbinit', issuing a warning if the old style initialization filename was found. Since this changes documented behavior, I also modified the documentation as an obvious fix. FYI, cgf ChangeLog: 2001-11-24 Christopher Faylor * win32-nat.c (_initialize_check_for_gdb_ini): New function. doc/ChangeLog: 2001-11-24 Christopher Faylor * gdb.texinfo (File Options): Change description of -nx and gdb.ini to specifically refer to MS-DOS. (command files): Mention gdb.ini is only used on MS-DOS. Index: win32-nat.c =================================================================== RCS file: /cvs/uberbaum/gdb/win32-nat.c,v retrieving revision 1.36 diff -u -p -r1.36 win32-nat.c --- win32-nat.c 2001/11/01 16:17:08 1.36 +++ win32-nat.c 2001/11/24 18:17:38 @@ -32,6 +32,7 @@ #include "command.h" #include "completer.h" #include "regcache.h" +#include "top.h" #include #include #include @@ -1752,4 +1753,32 @@ void _initialize_core_win32 (void) { add_core_fns (&win32_elf_core_fns); +} + +void +_initialize_check_for_gdb_ini (void) +{ + char *homedir; + if (inhibit_gdbinit) + return; + + homedir = getenv ("HOME"); + if (homedir) + { + char *p; + char *oldini = (char *) alloca (strlen (homedir) + + sizeof ("/gdb.ini")); + strcpy (oldini, homedir); + p = strchr (oldini, '\0'); + if (p > oldini && p[-1] != '/') + *p++ = '/'; + strcpy (p, "gdb.ini"); + if (access (oldini, 0) == 0) + { + int len = strlen (oldini); + char *newini = alloca (len + 1); + sprintf (newini, "%.*s.gdbinit", len - (sizeof ("gdb.ini") - 1), oldini); + warning ("obsolete '%s' found. Rename to '%s'.", oldini, newini); + } + } } Index: config/i386/xm-cygwin.h =================================================================== RCS file: /cvs/uberbaum/gdb/config/i386/xm-cygwin.h,v retrieving revision 1.4 diff -u -p -r1.4 xm-cygwin.h --- xm-cygwin.h 2001/08/27 22:39:56 1.4 +++ xm-cygwin.h 2001/11/24 18:17:38 @@ -22,15 +22,5 @@ #include "fopen-bin.h" -#define GDBINIT_FILENAME "gdb.ini" - /* Define this if source files use \r\n rather than just \n. */ #define CRLF_SOURCE_FILES - -/* If under Cygwin, provide backwards compatibility with older - Cygwin compilers that don't define the current cpp define. */ -#ifdef __CYGWIN32__ -#ifndef __CYGWIN__ -#define __CYGWIN__ -#endif -#endif Index: doc/gdb.texinfo =================================================================== RCS file: /cvs/uberbaum/gdb/doc/gdb.texinfo,v retrieving revision 1.55 diff -u -p -r1.55 gdb.texinfo --- gdb.texinfo 2001/11/22 00:21:45 1.55 +++ gdb.texinfo 2001/11/24 18:17:49 @@ -913,7 +913,7 @@ batch mode or quiet mode. @cindex @code{--nx} @cindex @code{-n} Do not execute commands found in any initialization files (normally -called @file{.gdbinit}, or @file{gdb.ini} on PCs). Normally, +called @file{.gdbinit} or @file{gdb.ini} under MS-DOS). Normally, @value{GDBN} executes the commands in these files after all the command options and arguments have been processed. @xref{Command Files,,Command files}. @@ -13067,8 +13067,9 @@ the last command, as it would from the t @cindex @file{.gdbinit} @cindex @file{gdb.ini} When you start @value{GDBN}, it automatically executes commands from its -@dfn{init files}. These are files named @file{.gdbinit} on Unix and -@file{gdb.ini} on DOS/Windows. During startup, @value{GDBN} does the +@dfn{init files}. These files are normally named @file{.gdbinit} although +filename limitations require that they be named @file{gdb.ini} on MS-DOS. +During startup, @value{GDBN} does the following: @enumerate